Fix error with procs caused by break checks.
Merge origin/master