Possible fix on the extended_name issue