Better fix for bank change glitches