Extend fix for #3419
1 file changed