Fix 1.8 incompatibility