Fix unnecessary encode [RD-64]