fixed comment + todo