Fixes DEVELOPER-853
Merge pull request #439 from LightGuard/DEVELOPER-853

Fixes DEVELOPER-853