Part of the fix for PROB-295