Fix bug with command-line only options and conditions