Fix 5.3 compatibility