LPS-44515 Fix compilation and keep behaviour