Fix issue #1383
Merge pull request #1387 from ghost1227/bugs/1383

Fix issue #1383