fixed 1.8 bug