Fixed command-line arguments