LPS-36686

Hey Eric,

I modified your logic because I think that there is some logic that is not needed.
Can you please retest it and make sure that it doesn't break anything and that it works properly?

Thx!