cpu100percentfix
master
The former patch was too local; this one integrates better with the structure of the code.