Fixed TODO (yes, again)