fix for PSCFV-9770