LPS-44908 Use new helper method