Fix compile error after previous merge