Fix 4.8 build