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

Repairs bug when re-executing
Merge commit '915e9d997817d931500479ee7afcc9249ff4d4ad'