Try to fix 1.8 error