Fix a bug with save