Fixed issue #382: Add encoding chosen