Fixed JoinController