fine tune fix of Bug ZK-1885