Fixing for extensibility