fixed overrides