remove bug that created recursion when broken capture is shut down.
merge