[FIX] Fixes #1110
Merge pull request #1115 from TheSerapher/issue-1110

[FIX] Fixes #1110