Fix slow joiner problem