fix according to the latest commits