LPS-37391

This was originally sent to Igor, however he's out right now so I was told to send to you.  This is a urgent fix for a client.  Please review asap, thanks!