Fix 1.8 support