Did the original code just miss creating an entry for the connection here?

The value map is still a NBHM, should it be replaced as well?