Fixed #1252, cheers @Royalot
Merge pull request #1253 from xWhiteTiger/master

Fixed #1252, cheers @Royalot