Zip code field wrapped around span element with element. HTML output?

Hey guys,

Using Gravity Forms 1.6.4.3 I ran into a issue using the address field. Currently the address field is being displayed on the page but somehow the span element for the zip code is being thrown just outside the select element that's being used for the state selection.

<li id='field_11_3' class='gfield gfield_contains_required' >
	<label class='gfield_label' for='input_11_3_1'>Address<span class='gfield_required'>*</span></label>
		<div class='ginput_complex ginput_container' id='input_11_3'>
			<span class='ginput_full' id='input_11_3_1_container'><br />
				<input type='text' name='input_3.1' id='input_11_3_1' value='' tabindex='3' />
				<label for='input_11_3_1' id='input_11_3_1_label'>Street Address</label>
			</span>
			<span class='ginput_full' id='input_11_3_2_container' ><br />
				<input type='text' name='input_3.2' id='input_11_3_2' value='' tabindex='4' />
				<label for='input_11_3_2' id='input_11_3_2_label'>Address Line 2</label>
			</span>
			<span class='ginput_left' id='input_11_3_3_container'><br />
				<input type='text' name='input_3.3' id='input_11_3_3' value='' tabindex='5' />
				<label for='input_11_3_3' id='input_11_3.3_label'>City</label>
			</span>
			<span class='ginput_right' id='input_11_3_4_container' ><br />
				<select name='input_3.4' id='input_11_3_4' tabindex='6'   >
				<option value='' selected='selected'></option>
			</select>
			<p><label for='input_11_3_4' id='input_11_3_4_label'>State</label>
			</span>
<!--Problem starts here-->
<!--This should be outside span element input_11_3_4_container-->
			<span class='ginput_left' id='input_11_3_5_container'><br />
				<input type='text' name='input_3.5' id='input_11_3_5' value='' tabindex='8' />
				<label for='input_11_3_5' id='input_11_3_5_label'>Zip Code</label>
			</span><br />
				<input type='hidden' class='gform_hidden' name='input_3.6' id='input_11_3_6' value='United States'/>
			</div>
</li>

When it should look like:

<li id="field_1_1">
<label>label here</label>
<div class="ginput_complex">
<span class="ginput_full">Street Address Field</span>
<span class="ginput_full">Street Address 2 Field</span>
<span class="ginput_full">City field</span>
<span class="ginput_full">Select dropdown field</span>
<span class="ginput_full">Zip code field</span>
</div>
</li>

Of course I simplified the code, but just to give you an idea.

Any idea as to why it renders that way?

I have 1.7.6 and have the same issue. Zip Code filed is pushing to the right under state.