fix 2nd changes