LPS-43427 SF - simplify solution