HOTFIX: overriding now actually works