Fixed issue when using spaces in command param.