diff --git a/handler/event.go b/handler/event.go
index 96bb40e..34f41ec 100644
--- a/handler/event.go
+++ b/handler/event.go
@@ -207,10 +207,10 @@ func (h *Handler) queryEvents(tx *gorm.DB, c echo.Context) error {
 		return c.HTML(http.StatusBadGateway, err.Error())
 	}
 
-	for i, event := range events {
-		events[i].Author = usersMap[event.AuthorId]
-		events[i].Medic = usersMap[event.MedicId]
-		events[i].Person = personsMap[event.PersonId]
+	for i, _ := range events {
+		events[i].Author = usersMap[events[i].AuthorId]
+		events[i].Medic = usersMap[events[i].MedicId]
+		events[i].Person = personsMap[events[i].PersonId]
 	}
 
 	return c.JSON(http.StatusOK, events)