LPS-32875 Fix compile erorr
LPS-32875 Simplify