fixes 1.4 branch