Fix 5.3/5.4 issue.