Fix 5.4 compatibility