CDK-546: Fixed an issue with argument handling.