Fixes bad behavior of first-time rsvp-usage