FIX: Join did not work properly with clusters