fixed arguments list parsing code