Fixes DEVELOPER-527