Fixed backup/restore issues from merge.
Merge pull request #241 from dovy/master

Fixed import/backup problems