fixes accroding new specs