Bopp from twitching I prevent.
Merge pull request #1839 from jkazimir/master

Bopp from twitching I prevent.