fix generation with modules labelling