fixed incorrect references in save