Actually fixed todo