Fix bug ZK-1766