Saving bug fix