fine tune Bug ZK-1234