Improve on the fix for #3380