LPS-24294

Hey Jon. Here is Rob's fix for LPS-24294.