Remove infinite loops introduced with wrong use of 'super'