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