Fixing rsvp