LPS-41275

Julio, can you do an additional review on this fix. It works and this should be the right place for the fix, but I'm not sure it's the correct fix. Thanks.