LPS-48979

Tested and working fine, this bug has been reviewed by @izarea and @robertoDiaz. thank you.