[3.7] Fixes 3.7.8