Fix join (this is going to take a long time :( )