1.8.7 RC6

Handle the case when the auto-detected encoding does not correspond with the user's choice