1.7 fixes 1.6