fixing DEVELOPER-788
Merge pull request #368 from wesbos/DEVELOPER-788

Fixing DEVELOPER-788