[fix] errors after refactoring