fix 1.8 problems
new versions