Fixed Nickchange handling