Potential fix for SPR-10744

Issue: SPR-10744