Add: who has nickname + bugfix