Really fixed TODO