Fixed multiple joins when moving between Servers

Fixes #42