Fix calculation step save