Make nickchange more robust