Lost taps

This should address the problem where collectors stop refreshing taps.