LPS-32110 Proper fix