1.8 fix 1.7