Refix bug ZK-1473