Fixed high CPU usage