Attempt at fixing terminated branches problem
Fixed issue, but is it a permanent fix?