Repairs bug when re-executing (#2781)
Merge pull request #2792 from aeslaughter/peaock

Repairs bug when re-executing