Fix side effect of bug ZK-1718