backporting my fix to RSVP