Fixed: Allow joining on first try (maybe?)