configuration_generation_bug_fix