Merge pull request #1878 from hdf89shfdfs/multi_generator_bug

Fix mulit-configuration bug