fixing /join