Add fix for missing charsets