FIX: adapted to changes in parent class