CLI argument handling fix