Fix bug with restoring non-assigned option