Fix for lower CPU usage