Fix address inflection issue
Merge pull request #59 from flyvictor/fix-address-inflection-issue

Fix address inflection issue