fix Bug ZK-460