diff --git a/def.go b/def.go
index d1412ae..3ba3392 100644
--- a/def.go
+++ b/def.go
@@ -119,10 +119,10 @@ func fromChatWarsDate(d string) (t time.Time, err error) {
 			days++
 		}
 		t, _ := time.Parse(time.RFC3339, "2018-01-31T00:00:00+00:00")
-		t = t.Add((days / 3) * time.Day())
-		t = t.Add((days % 3) * 8 * time.Hour())
-		t = t.Add(strconv.Atoi(r.ReplaceAllString(d, "${Hour}")) * 20 * time.Minute())
-		t = t.Add(strconv.Atoi(r.ReplaceAllString(d, "${Minute}")) * 20 * time.Second())
+		t = t.AddDate(0, 0, (days / 3))
+		t = t.Add((days % 3) * 8 * time.Hour)
+		t = t.Add(strconv.Atoi(r.ReplaceAllString(d, "${Hour}")) * 20 * time.Minute)
+		t = t.Add(strconv.Atoi(r.ReplaceAllString(d, "${Minute}")) * 20 * time.Second)
 		return t, nil
 	} else {
 		return time.Now(), errors.New("Wrong format")