Fix parsing of Unknown commands