Fix compilation error after merge