Fixed duplicate --timeout setting