fix when no need to join