Make JOINing actually work!