Remove  command.Leaves()
Merge branch 'master40'