fixing join?