Fixed joins that should have broken earlier
Fixed joins that should have broken earlier

square/shuttle,visoft/shuttle,visoft/shuttle,square/shuttle,square/shuttle,visoft/shuttle,square/shuttle,visoft/shuttle