Removed late_join == 0 -> manual_connect = True statement