OPINION ON APPELLANT’S PETITIONS FOR DISCRETIONARY REVIEW
MALONEY, Judge.Appellant was convicted in 1987 on his pleas of guilty to two counts of aggravated sexual assault, two counts of indecency with a child, and incest. Punishment was assessed by the trial court at fifteen years and ten years in the Texas Department of Corrections on the aggravated sexual assault counts, to be served consecutively, and at five years each on the other counts, to be served concurrently.
The Court of Appeals held that the charges against appellant were misjoined in two indictments,1 and ordered the judgments reformed to delete reference to the reversed convictions. Saldana v. State, Nos. 04-87-503-CR and 04-87-504-CR (Tex.App. — San Antonio, delivered December 7, 1988). On appellant’s petition for discretionary review, this Court held that reformation of the judgments was not the proper remedy and remanded to the trial court for reassessment of punishment as to each aggravated sexual assault conviction.2 Saldana v. State, Nos. 144-89 and 145-89 (Tex.Cr.App., delivered June 28, 1989).
On remand the trial court denied appellant’s motion to have a jury assess punishment. The trial court ruled that appellant waived his right to a jury at the time he entered his original pleas of guilty, and then assessed punishment at fifteen years confinement on each count. The Court of Appeals affirmed. Saldana v. State, Nos. 04-90-023-CR and 04-90-129-CR (Tex.App. — San Antonio, delivered October 17, 1990). We granted appellant’s petitions for discretionary review to determine whether he was bound by his waiver of a jury at the original trial upon remand for another punishment hearing pursuant to Article 44.-29(b), V.A.C.C.P.
Prior to 1987 the Code of Criminal Procedure required that a complete new trial be conducted if an appellate court determined that reversible error had occurred at the punishment phase of trial and a jury had assessed punishment, but permitted a hear*950ing limited to assessment of punishment if the trial court had assessed punishment. See Bullard v. State, 548 S.W.2d 13 (Tex.Cr.App.1977). The 70th Legislature then enacted Art. 44.29(b) to permit retrial limited to assessment of punishment in cases in which a jury had originally assessed punishment and an appellate court found reversible error to have occurred at that punishment phase.3 Acts 1987, 70th Leg., pp. 1387-1378, Ch. 179, § 1, eff. August 31, 1987.
Article 44.29(b) provides:
If the court of appeals or the Court of Criminal Appeals awards a new trial to a defendant other than a defendant convicted of an offense under Section 19.03, Penal Code, only on the basis of an error or errors made in the punishment stage of the trial, the cause shall stand as it would have stood in case the new trial had been granted by the court below, except that the court shall commence the new trial as if a finding of guilt had been returned and proceed to the punishment stage of trial under Subsection (b), Section 2, Article 37.07, of this Code. If the defendant elects, the court shall empanel a jury for the sentencing stage of the trial in the same manner as a jury is empaneled by the court for other trials before the court. At the new trial, the court shall allow both the state and the defendant to introduce evidence to show the circumstances of the offense and other evidence as permitted by Section 3 of Article 37.07 of this code.
Article 37.07, § 2(b), V.A.C.C.P., provides:
Except as provided in Article 37.071, if a finding of guilty is returned, it shall then be the responsibility of the judge to assess the punishment applicable to the offense; provided, however, that (1) in any criminal action where the jury may recommend probation and the defendant filed his sworn motion for probation before the trial began, and (2) in other cases where the defendant so elects in writing before the commencement of the voir dire examination of the jury panel, the punishment shall be assessed by the same jury, except as provided in Article 44.29. If a finding of guilty is returned, the defendant may, with the consent of the attorney for the state, change his election of one who assesses the punishment.
The Court of Appeals read the two provisions together and interpreted the language in Art. 37.07 “except as provided in Article 44.29” to mean that, “if the defendant elects at the original trial to have the jury assess punishment, it will be the same jury as determined guilt, unless the case was reversed and remanded for new punishment assessment only. Saldana, supra, slip op. at 5 (emphasis in original). Therefore, the Court of Appeals held that the reference in Art. 44.29 to Art. 37.07 does not apply when a defendant had pled guilty before the judge. Id.
The question presented in this cause is whether the language in Art. 44.29(b), “If the defendant elects, the court shall empanel a jury for the sentencing stage of the trial in the same manner as a jury is empaneled by the court for other trials before the court,” entitles a defendant who had not elected a jury assessment of punishment prior to commencement of voir dire at his original trial to receive jury assessment after reversal for error at the punishment phase, or whether he is bound by his original election. We believe the enactment of Art. 44.29(b) has created a right to choose either jury or court assessment of punishment after such a remand, notwithstanding such choice at the original trial.
*951Texas Senate Bill 43, 70th Leg. (1987) proposed the enactment of Art. 44.29(b), including the language, “If necessary, the court shall empanel a jury for the sentencing stage of the trial in the same manner as a jury is empaneled by the court for other trials before the court.” (emphasis added.) The Senate Criminal Justice Committee conducted a public hearing on the bill on March 3, 1987. At the conclusion of the hearing the committee agreed to change “[i]f necessary” to “[i]f the defendant elects.”4
The provision, “If the defendant elects,” occurs immediately following the requirement that “the court shall commence the new trial as if a finding of guilt had been returned and proceed to the punishment stage of trial under Subsection (b), Section 2, Article 37.07, of this Code,” thereby indicating the referenced election would be made after the remand. Additionally, Art. 44.29(b) requires that “the court shall empanel a jury for the sentencing stage of the trial in the same manner that a jury is empaneled by the court for other trials before the court,” except that only the issue of punishment shall be submitted to the jury. Although Art. 37.07, § 2(a) applies to cases in which a plea of not guilty is entered before a jury, § 2(b) does not contain any such restriction other than by inference, and the provision, “except as provided by Article 44.29,” eliminates the need to apply such an inferential restriction to Art. 44.29(b).
The legislature did not specifically restrict Art. 44.29(b) to situations in which a jury had assessed punishment in the original trial. A fair reading of the language of the statute indicates that a defendant is to have the right to elect jury assessment of punishment after remand, and a review of the legislative history of this statute discloses nothing contrary to such an interpretation. Therefore, we conclude Art. 44.-29(b) permits a defendant to elect jury assessment of punishment after remand pursuant to an appellate finding of reversible error at the punishment phase, notwithstanding a waiver of jury before his original trial. The judgments of the trial court and Court of Appeals are reversed.
WHITE and BENAVIDES, JJ. concur in the result.. See Fortum v. State, 745 S.W.2d 364 (Tex.Cr. App.1988)
. See Ex Parte Broyles, 759 S.W.2d 674 (Tex.Cr. App.1988), holding that when a trial court assesses punishment based on misjoined offenses, the proper remedy is to remand to that court for a new hearing to reassess punishment on one offense per indictment.
. We have previously concluded that application of Art. 44.29(b) to reversals of convictions obtained prior to its effective date does not violate the ex post facto provisions of either the Texas or United States constitutions. Grimes v. State, 807 S.W.2d 582 (Tex.Cr.App.1991). We have also held that the decision of whether to conduct an entire new trial or only a new punishment hearing is left to the discretion of the trial court, not the appellate court. Ex parte Klasing, 738 S.W.2d 648 (Tex.Cr.App.1987) (opinion on rehearing).
. Microfilmed bill file, Tex.Legislative Reference Library, 70th Leg., Senate Bill 43 (1987). The original bill was filed January 13, 1987. The amended bill was passed by the Senate March 16, 1987. The bill passed the House without amendment on May 11, 1987.