Fixing RSVP