LPS-45525 Simpler fix