hopefully fixed the issue where display name gets corrupted