To fix the bugs from recently merged branches