Another NICKing fix