Session saving fixed