LPS-45009 Avoid chaining