fix according review