Fix rsvp for more than 2