Fix bug ZK-1701