Fix
Merge pull request #1177 from ahomatthew/develop

Fix