fine tune Bug ZK-1234
release 6.5.3