Fix for [COOK-3783]

Fixes [COOK-3783]