Consider to open issue about this TODO