Improve on the fix for #3380
1 file changed