Cpu fix

Fix problem introduced during last week madness. 
Replace #662