More robustness in overrides