Fixing issue with the comma encoding