Backport !32 to branch 5

Title. The bug resolved by !32 (merged) on main branch also happens on branch 5. It would be nice to apply the fix there.