Super ugly hack to partially fix 'super'