Fixes DEVELOPER-752 and DEVELOPER-747
Merge pull request #335 from LightGuard/DEVELOPER-752

Fixes DEVELOPER-752 and DEVELOPER-747