Fixed problem with charset