Fix bug reported by David Eisner <deisner@gmail.com>. When allocating cli