Fix selecting address