LPS-33838

Hey @Robert-Frampton, what do you think of this fix? Attempt #2