Fix bug ZK-1715