LPS-48806

Hi Brian, this was reviewed by @sergiogonzalez, I've tested his changes and the fix works fine. Thank you.