Fix for #3868