Fixes DEVELOPER-417