fix joins