LPS-31834 Fixing a regression

Hey Sergio,

this is a regression bug fix coming from Alex. Originally the change was created by me, and actually Brian caused the regression :) Anyway, it's a small fix, and the changes seem ok for me, i've also tested it. Thanks!

Máté