#11 - Fix address and monkey-patch class Module