Fixing old bug when some arguments were not properly split (if contained spaces for example)