Fixes #SSEER-43
Merge pull request #1067 from Tendrid/develop

Fixes #SSEER-43