Fixed command line arguments handling.