Use a fixed version of rsvp