fixed fuzzy TODO issue