fix bugs (branch in list)