save/restore bug in Views fixed
merging