Fixed issue with splitting of arguments in commands.