Fix for COOK-2238
Merge pull request #37 from gsandie/COOK-2238

Fix for COOK-2238