Hopefully fixed the Nickname system
@asiekierka, why are you so slow...
Fixes #17