Fix 5.3 incompatibility