ZP2 relationClosures fix