Fixed CLI Options bug