https://github.com/weld/core/pull/1725 contains a partial fix for this issue. We've also created/linked WELD-2424 to track an issue which will be more complicated to fix.