Fixes #6166 - ensure we don't execute the same execution plan twice in a row
Merge pull request #65 from iNecas/issue/6166

Fixes #6166 - ensure we don't execute the same execution plan twice in a row