Refine the fixed of ZK-2296 and fix for ZK-2328.