fixes 1.0 branch