Resolve address fix