tried to fix the name encoding errors