Fix compile error after merge