fixes 2.2 branch