Fix for #3281.