Fix to invite handling