Fix bug with save