refix ZK-2473: fix side effects in ZK-1437 && ZK-1708