fixed broken overrides