Fixed #3, major changes in JoinManager