Fix 1.8 compat