Fixed save method