Fixing 'same_address' handling for parents