Fixed bug with save