TooTallNate#171

fix 100% CPU issue
(cherry picked from commit ea7e061)