fixing addresses