Better CPU leaking fix

Doesn't block the entire application in the process like the previous
fix.