Fixing DEVELOPER-788

See DEVELOPER-788 for more explanation