LPS-52011

@mikemanyoung, Tomas- can you review this fix? Thx