Fix collector registering HM and router