LPS-34021 More reliable check