Fix 5.3 compat