Fix COOK-1855