fixes 1.2 branch