finally eliminate a silly TODO