latest fixes 1.8