fix according modified interfaces