Fixing rsvp defer