LPS-51315 simplify