Issue #1853272 by mahfiaz: Fixes another inconsistency with encodings. Thanks you sano for reporting.