fix according to kmf changes