LPS-47945 apply new method