Fix 1.8.7 incompatible syntax