bugfix for anti-popcorn
Merge pull request #132 from lrolleman/master

bugfix for anti-popcorn