Fix bug ZK-1723