diff --git a/seminar/forms.py b/seminar/forms.py
index 71402a58..c64095c6 100644
--- a/seminar/forms.py
+++ b/seminar/forms.py
@@ -2,6 +2,7 @@ from django import forms
 from dal import autocomplete
 from django.core.exceptions import ObjectDoesNotExist
 from django.contrib.auth.models import User
+from django.forms import formset_factory
 from django.forms.models import inlineformset_factory
 
 from .models import Skola, Resitel, Osoba, Problem
@@ -302,12 +303,16 @@ class NahrajObrazekKTreeNoduForm(forms.ModelForm):
 		fields = ('na_web',)
 
 
-OhodnoceniReseniFormSet = inlineformset_factory(m.Reseni, m.Hodnoceni,
-		fields = ('problem', 'body', 'cislo_body'),
-		extra = 1,
+class JednoHodnoceniForm(forms.ModelForm):
+	class Meta:
+		model = m.Hodnoceni
+		fields = ('problem', 'body', 'cislo_body')
 		widgets = {
 			'problem': autocomplete.ModelSelect2(
 				url='autocomplete_problem_odevzdatelny',   # FIXME: Dovolit i starší?
 				)
 			}
+
+OhodnoceniReseniFormSet = formset_factory(JednoHodnoceniForm,
+		extra = 0,
 		)
diff --git a/seminar/templates/seminar/odevzdavatko/detail.html b/seminar/templates/seminar/odevzdavatko/detail.html
index 000167a3..dd4979f3 100644
--- a/seminar/templates/seminar/odevzdavatko/detail.html
+++ b/seminar/templates/seminar/odevzdavatko/detail.html
@@ -38,18 +38,18 @@ function deleteForm(prefix, btn) {
 // Credit: https://simpleit.rocks/python/django/dynamic-add-form-with-add-button-in-django-modelformset-template/
 $(document).ready(function(){
 	$('#pridat_hodnoceni').click(function() {
-		var form_idx = $('#id_hodnoceni_set-TOTAL_FORMS').val();
+		var form_idx = $('#id_form-TOTAL_FORMS').val();
 		var new_form = $('#empty_form').html().replace(/__prefix__/g, form_idx);
 		$('#form_set').append(new_form);
 		// Newly created form has not the binding between remove button and remove function
 		// We need to add it manually
 		$('.smazat_hodnoceni').click(function(){
-			deleteForm("hodnoceni_set",this);
+			deleteForm("form",this);
 		});
-		$('#id_hodnoceni_set-TOTAL_FORMS').val(parseInt(form_idx) + 1);
+		$('#id_form-TOTAL_FORMS').val(parseInt(form_idx) + 1);
 	});
 	$('.smazat_hodnoceni').click(function(){
-		deleteForm("hodnoceni_set",this);
+		deleteForm("form",this);
 	});
 });
 </script>
diff --git a/seminar/views/odevzdavatko.py b/seminar/views/odevzdavatko.py
index 0c182695..e81f119f 100644
--- a/seminar/views/odevzdavatko.py
+++ b/seminar/views/odevzdavatko.py
@@ -166,6 +166,8 @@ def hodnoceniReseniView(request, pk, *args, **kwargs):
 	# FIXME: Použit initial i tady a nebastlit hodnocení tak nízkoúrovňově
 	# Also: https://docs.djangoproject.com/en/2.2/topics/forms/modelforms/#django.forms.ModelForm
 	formset = f.OhodnoceniReseniFormSet(request.POST)
+	# TODO: Napsat validaci formuláře a formsetu
+	# TODO: Implementovat větev, kdy formulář validní není.
 	if formset.is_valid():
 		with transaction.atomic():
 			# Smažeme všechna dosavadní hodnocení tohoto řešení