[3.7] fixes 3.7.9