was also fixed according to the last changes