save and bug fix