Fixed overrides