refix ZK-2494: fix for side effects in B35-2480892 && B65-ZK-1626