LPS-46537 Move it lower
LPS-46537 Make it more robust