Fixes #712
Merge pull request #735 from fabrixxm/bug712

Fixes #712