Fixed issues with NICK events