Fix argument/text splitting