Fix bug ZK-1574