Fix 18 build