Improve immune spaces logic
am: 06fc03b2bf

* commit '06fc03b2bf02f1ccecfaaaaaa36ee8be65711c47':
  Improve immune spaces logic