additional update for CDK 1.5.x