Fix ZK-1840: fine tune