Fix late joins