Bug fix
Merge pull request #19 from guardian/re-fix

Bug fix