LPS-45802 Avoid chaining