Can anyone test my patch and try and narrow down the problem as per comment 5? 
I'm not table to reproduce this on any of the BTC cards I have access to.