Fixed the schedulled appearing in the TODO