LPS-31889 Minimal solution