Fix more output saving