Fix for issue CDK - 473.
Added changes suggested by Tom.