Fix for explicit overrides