Fix the problem after migration of branches