CDK-546: Fixed a bug with the updated Main