Fix problem from merge