moved TODO to an issue