Additional bug fix for address struct copying