SOS-2228

Hey Jon,

I was told to send this through you to get it committed a bit faster by Jon Tanamachi. Let me know if you have any questions about the fix.

Thanks.