Fix bug ZK-1686