fixed commands with space issue