destination address set fix
Merge branch 'hotfix/destination-address-fix'