Fix 5.2.10 compatibility