address review comment: add TODO comment

- commit will be squashed before merging the PR