bug fix with save