Bug fix: some components run away on stop