Re-fix bug ZK-868