Fixed #1172 (for real)
Merge pull request #1240 from Varriount/fix-1172

Fixed #1172 (for real)