diff --git a/greenmine/projects/tasks/api.py b/greenmine/projects/tasks/api.py
index ff8c3236..48d36b61 100644
--- a/greenmine/projects/tasks/api.py
+++ b/greenmine/projects/tasks/api.py
@@ -44,6 +44,7 @@ class TaskViewSet(NotificationSenderMixin, ModelCrudViewSet):
     permission_classes = (IsAuthenticated, permissions.TaskPermission)
     filter_backends = (filters.IsProjectMemberFilterBackend,)
     filter_fields = ["user_story", "milestone", "project"]
+
     create_notification_template = "create_task_notification"
     update_notification_template = "update_task_notification"
     destroy_notification_template = "destroy_task_notification"
diff --git a/greenmine/projects/userstories/serializers.py b/greenmine/projects/userstories/serializers.py
index 77e48b54..b7e3a6ba 100644
--- a/greenmine/projects/userstories/serializers.py
+++ b/greenmine/projects/userstories/serializers.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import json, reversion
+from django.db.models import get_model
 from rest_framework import serializers
 
 from greenmine.base.serializers import PickleField
@@ -32,13 +33,15 @@ class UserStorySerializer(serializers.ModelSerializer):
     def save_object(self, obj, **kwargs):
         role_points = obj._related_data.pop("role_points", None)
         super(UserStorySerializer, self).save_object(obj, **kwargs)
-        obj.project.update_role_points()
 
+        points_modelcls = get_model("projects", "Points")
+
+        obj.project.update_role_points()
         if role_points:
             for role_id, points_order in role_points.items():
                 role_points = obj.role_points.get(role__id=role_id)
-                role_points.points = models.Points.objects.get(project=obj.project,
-                                                               order=points_order)
+                role_points.points = points_modelcls.objects.get(project=obj.project,
+                                                                 order=points_order)
                 role_points.save()
 
     def get_total_points(self, obj):