fixed order in save changes