Fix CPU 100% Issue

* hopefully this will fix the 100% CPU issue