fixed according to recommendations