Fixed the issue related to strange names