Fix for #3410.