re-fix bug ZK-1205 and ZTL-test ZK-1583