diff --git a/src/homework/models.py b/src/homework/models.py
index 3f0933e367e8cfc766fc2dfdbca7b7da717fbc34..681953d793cc02a531da93547037dea6a1ac61fa 100644
--- a/src/homework/models.py
+++ b/src/homework/models.py
@@ -11,8 +11,8 @@ from django.core import validators
 __MAX_UPLOAD_SIZE = 5242880
 
 
-def validate_deadline(date):
-    if date <= timezone.now():
+def validate_deadline(deadline):
+    if deadline <= timezone.now():
         raise ValidationError(_('Date must be greater than now'), code='invalid')
 
 
diff --git a/src/homework/views.py b/src/homework/views.py
index e778ca157d85558c9713cf1ce5a19287b9794342..86a64efa89f5533d2264f6c65abb43eb9d0c4623 100644
--- a/src/homework/views.py
+++ b/src/homework/views.py
@@ -5,7 +5,7 @@ from rest_framework.decorators import list_route
 from django.http import Http404
 from django.shortcuts import get_object_or_404
 import datetime
-from django.utils.timezone import utc
+from django.utils import timezone
 
 from . import serializers
 from . import models
@@ -27,7 +27,7 @@ class SolutionsViewSet(viewsets.ModelViewSet):
         serializer.validated_data['accepted'] = False
         task = serializer.validated_data['task']
         # task = get_object_or_404(models.Task, pk=task_id.id)
-        now = datetime.datetime.utcnow().replace(tzinfo=utc)
+        now = timezone.now()
         if task.deadline < now:
             raise Http404("Deadline")
         serializer.save()