Fixed CLI Builder.