fix according comments