Fix attribute overrides properly :)