fix according to new factory