CLI launcher fixed