diff --git a/src/ClientServer/Controllers/Core/Exercises/DoExerciseController.cs b/src/ClientServer/Controllers/Core/Exercises/DoExerciseController.cs
index 035ec00ca7f4a3db857f17a74447bc3e35c8bd78..8f2bebc83d8dd1b4eb868c13e21b1bd225eb0694 100644
--- a/src/ClientServer/Controllers/Core/Exercises/DoExerciseController.cs
+++ b/src/ClientServer/Controllers/Core/Exercises/DoExerciseController.cs
@@ -2026,6 +2026,7 @@ namespace ClientServer.Controllers.Core.Exercises
                         .Where(p => p.ExerciseRelease.GeneratedCode == generatedCode && p.UserId == userId)
                         .Include(p => p.Solutions)
                         .ThenInclude(p => p.SolutionFiles)
+                        .ThenInclude(solutionFile => solutionFile.TemplateFile)
                         .Include(p => p.Solutions)
                         .ThenInclude(p => p.CustomTestResults)
                         .Include(p => p.Solutions)
diff --git a/src/ClientServer/Controllers/Core/Exercises/ReleaseController.cs b/src/ClientServer/Controllers/Core/Exercises/ReleaseController.cs
index b2f696a6cac35e782b93b666f201a012fdddb2ae..9e54f6e65d746dfb60a460df8f8a450bac11d62f 100644
--- a/src/ClientServer/Controllers/Core/Exercises/ReleaseController.cs
+++ b/src/ClientServer/Controllers/Core/Exercises/ReleaseController.cs
@@ -1271,7 +1271,7 @@ namespace ClientServer.Controllers.Core.Exercises
                 AutomaticEndAt = DateTimeHelper.SetKind(foundRelease.AutomaticEndAt),
                 AvailableWorkingTimeInMinutes = foundRelease.AvailableWorkingTimeInMinutes,
                 FirstAccessedAt = DateTimeHelper.SetKind(access.CreatedAt),
-                LastUpdatedAt = DateTimeHelper.SetKind(access.CreatedAt),
+                LastUpdatedAt = DateTimeHelper.SetKind(access.LastUpdatedAt),
                 HasLimitedWorkingTime = foundRelease.HasLimitedWorkingTime,
                 ReleasedForPLangId = foundRelease.PLangId,
                 ReleaseDurationType = (int) foundRelease.ReleaseDurationType,