CPU-load bug fix