Fixing PSCFV-12315

Fixing PSCFV-12315