NORMAL CHANGE: Address selection corrcted.