Fix 1.8.x incompatibility