fix 5.4 bug