FRANKFORT, Ky. (AP) – Kentucky’s state House has passed a bill that would create one marriage license form for both gay and straight couples in an effort to defuse controversy over the licensing of gay marriages.

The measure passed by the Democratic-led House on Friday has the blessing of Republican Gov. Matt Bevin. Under the House version, a marriage license applicant would have the option of checking “bride,” `’groom” or “spouse” beside their name.

The bill goes back to the Republican-led state Senate, which passed a different version calling for separate forms for gay and straight couples.

The proposals are a response to the controversy last year surrounding Kim Davis, a Kentucky county clerk who spent five days in jail for refusing to issue marriage licenses to same-sex couples.