bug fix and save