Marcelo,

please disregard my previous patch as it is needlessly invasive. I'm 
currently evaluating a smaller patch (attached) which does not require an 
audit of the low-level drivers and still fixes my problem.

Ben, can you please comment on this?

Thanks
Carl-Daniel