Fix handling of loaded configuration