Join and Leave fixed