LPS-45499 Uses the new method