Fixed issue with argument parsing