Fix compile error introduced during merge