fix 1.8 bug