Fix for #3286.