Fix for COOK-2148