Potential fix for #939
Merge pull request #1041 from KoffeinFlummi/sniper-clacker

Potential fix for #939