LPS-33173 Use existing method