Fix for #1250
Merge pull request #1282 from ghost1227/master

Fix for #1250