Another small TODO