LPS-43181 Simplify the fix