Fix broken code from merge