Fix compilation error from merge