Configuration system fix