Issue #10 : fix address