fixing join aliases