Revert "Revert "Improve immune spaces logic""
am: 0cc2a92374

* commit '0cc2a92374ef14b0e2104b9d4ea148750b657694':
  Revert "Revert "Improve immune spaces logic""