refix ZK-2418: fix for side effect in ZK-2313