join fix, finally fix