refix zk-1908
fine tune fix of Bug ZK-1885