Fixed issue with arg splitting