Fixed /join issue