GenerateCommand: multiple source fixed