Fixed defect in ZCW