Fix 1.8 compatibility