Potential fix for #1058
Merge pull request #1061 from immortius/develop

Potential fix for #1058