Fixes DEVELOPER-283