LPS-30341 Right move