Fix 5.3.3 compatibility