re-fix for ZK-2280