Fix parsing of arguments