Fixed another bug in handling command-line arguments