Re-fix bug ZK-1642