fixes 3 branch