fixing bugs with subscriber registry