Fix 5.4 issue