Another squashed CPU bug, hopefully!