Extend fix for #3419