Change: Fix Encoding option