fix this so that we specifically inject a listener in there