Fix #1193
Merge pull request #1200 from fabrixxm/issues/1193

Fix #1193