diff --git a/Controllers/ProjectsController.cs b/Controllers/ProjectsController.cs
index b07c915..d9f22a4 100644
--- a/Controllers/ProjectsController.cs
+++ b/Controllers/ProjectsController.cs
@@ -32,7 +32,10 @@ namespace TicketManager.Controllers
         [HttpGet("{id}")]
         public async Task<ActionResult<Project>> GetProject(int id)
         {
-            var project = await _context.Projects.FindAsync(id);
+            var project = await _context.Projects
+            .Include(p => p.Assignments)
+            .FirstOrDefaultAsync(p => p.Id == id);
+            // .FindAsync(id);
 
             if (project == null)
             { return NotFound(); }
diff --git a/Models/Project.cs b/Models/Project.cs
index fa54cf9..ebd6760 100644
--- a/Models/Project.cs
+++ b/Models/Project.cs
@@ -15,7 +15,7 @@ namespace TicketManager.Models
         {
             get
             {
-                return (float)this.Tickets.
+                return Tickets.Count() == 0 ? 0 : (float)this.Tickets.
                     Where(t => t.Status == Status.Done).Count()
                     / this.Tickets.Count()
                     * 100;