ticket:10 Fixed save method