diff --git a/main.go b/main.go
index 392d5506b6f5699b1a354cdf6eaa22f3a4a33830..d91aba74f92a2e3dddaf87f9ef458bd9b2a157bc 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,8 @@
 package main
 
-import "gitlab.cs.umd.edu/dawn/go-backend/dawn-gdd/cmd"
+import (
+	"gitlab.cs.umd.edu/dawn/go-backend/dawn-gdd/cmd"
+)
 
 func main() {
 	cmd.Execute()
diff --git a/services/gdd_service.go b/services/gdd_service.go
index df421a74af407356c1a95cedeafa6d31a6bcd290..85f97805e63e7ae84169c4fa787b594b288f4fe5 100644
--- a/services/gdd_service.go
+++ b/services/gdd_service.go
@@ -23,9 +23,9 @@ func GetGddValues(ctx context.Context, request models.GddRequest) models.GddResp
 			GddValues:        []float64{},
 		}
 	} else if request.PlantingDate.Before(time.Now()) || request.PlantingDate.YearDay() == time.Now().YearDay() {
-		gdds = persistence.GddRepository().FindCurrentGddByLocation(ctx, request.BuildLocation())
-	} else {
 		gdds = persistence.GddRepository().FindGddByLocationAndYear(ctx, request.PlantingDate.Year(), request.BuildLocation())
+	} else {
+		gdds = persistence.GddRepository().FindCurrentGddByLocation(ctx, request.BuildLocation())
 	}
 
 	// if request.PlantingDate.Year() >= time.Now().Year() {