             else if question_index < @input_fields.length
                 question_index += 1
 
-            @switch_question( $( '.control-group' ).eq( question_index )[0], true )
+            @switch_question( $( '#' + @input_fields[question_index].name + '_field' ), true )
 
             @
 

                $('.active input').focus()
                question++
                question_info = @input_fields[question]

          # Assumption of a group without controls
          else

              else
                if question > 0
                  question++
            question_change = $('#' + $($('.control-group').eq(question)[0]).data('key') + "_field")
            question_change.fadeIn(1).addClass('active')

          @


