LPS-48083 Uses the new function