Bug Fix on Local Address Selection