Avoid NoMatch recursive exception issue
Merge pull request #1 from davidread/patch-1

Avoid NoMatch recursive exception issue