Fixed a strange issue CC 1.6