Fix 1.8 incompatible syntax