TODO was resolved in earlier commit