Fixed cfg_generator