Fixed the 'Buddy Name' bug