Commit title: Correct bug and avoid non arguments launch

Description: