Contribute solution to LPS-44322