Minor correction and add TODO.