fixed argument parsing