diff --git a/greenmine/projects/issues/api.py b/greenmine/projects/issues/api.py
index feb319c8..854275a8 100644
--- a/greenmine/projects/issues/api.py
+++ b/greenmine/projects/issues/api.py
@@ -89,4 +89,4 @@ class IssueViewSet(NotificationSenderMixin, ModelCrudViewSet):
             if "comment" in self.request.DATA:
                 # Update the comment in the last version
                 reversion.set_comment(self.request.DATA["comment"])
-        super(IssueViewSet, self).post_save(obj, created)
+        super().post_save(obj, created)
diff --git a/greenmine/projects/issues/serializers.py b/greenmine/projects/issues/serializers.py
index e4404594..a621d1dd 100644
--- a/greenmine/projects/issues/serializers.py
+++ b/greenmine/projects/issues/serializers.py
@@ -19,7 +19,6 @@ class IssueSerializer(serializers.ModelSerializer):
         model = models.Issue
 
     def get_comment(self, obj):
-        # TODO
         return ""
 
     def get_issues_diff(self, old_issue_version, new_issue_version):
@@ -28,8 +27,8 @@ class IssueSerializer(serializers.ModelSerializer):
 
         diff_dict = {
             "modified_date": new_obj["modified_date"],
-            "by": old_issue_version.revision.user,
-            "comment": old_issue_version.revision.comment,
+            "by": new_issue_version.revision.user,
+            "comment": new_issue_version.revision.comment,
         }
 
         for key in old_obj.keys():
@@ -51,7 +50,7 @@ class IssueSerializer(serializers.ModelSerializer):
         current = None
 
         if obj:
-            for version in reversed(list(reversion.get_for_object(obj))):
+            for version in reversion.get_for_object(obj).order_by("revision__date_created"):
                 if current:
                     issues_diff = self.get_issues_diff(current, version)
                     diff_list.append(issues_diff)
diff --git a/greenmine/projects/userstories/serializers.py b/greenmine/projects/userstories/serializers.py
index 4e47e347..c2fe9585 100644
--- a/greenmine/projects/userstories/serializers.py
+++ b/greenmine/projects/userstories/serializers.py
@@ -48,11 +48,7 @@ class UserStorySerializer(serializers.ModelSerializer):
         return obj.get_total_points()
 
     def get_comment(self, obj):
-        version_list = reversion.get_for_object(obj)
-        if len(version_list) > 0:
-            return version_list[0].revision.comment
-        else:
-            return None
+        return ""
 
     def get_user_stories_diff(self, old_us_version, new_us_version):
         old_obj = old_us_version.field_dict
@@ -83,7 +79,7 @@ class UserStorySerializer(serializers.ModelSerializer):
         current = None
 
         if obj:
-            for version in reversed(list(reversion.get_for_object(obj))):
+            for version in reversion.get_for_object(obj).order_by("revision__date_created"):
                 if current:
                     us_diff = self.get_user_stories_diff(current, version)
                     diff_list.append(us_diff)