Fix compile error from previous merge mistake