Fix
- Moved condition above onUse
Merge pull request #844 from Skillert/patch-3

Fix