Unlimited run fix, and a variable to control it.