Add bug fix for unique nicknames