fix according to comments