Fix bug with save all