Fix #1293
Merge pull request #1295 from sigmavirus24/issue1293

Fix #1293