LPS-52072 simplify?