Fixed bugs in multiple address support.