fixed save/restore on Island_view
merging