Another CLI fix.