Potential CPU bug fix. (untested)