LPS-46537 Better fix