[BUGFIX] bugfix/multiple address type