Very important bug fix with encoding + save feature