Fix bug with removing subscribers w/ predicates