minor fix and add TODO