Subject map regression fix