diff --git a/src/Plugin/facets/query_type/SearchApiDate.php b/src/Plugin/facets/query_type/SearchApiDate.php
index b4cf325..ff03f37 100644
--- a/src/Plugin/facets/query_type/SearchApiDate.php
+++ b/src/Plugin/facets/query_type/SearchApiDate.php
@@ -85,13 +85,13 @@ protected function calculateRangeAbsolute($value) {
 
     switch ($this->getGranularity()) {
       case static::FACETAPI_DATE_YEAR:
-        $startDate = $dateTime::createFromFormat('Y-m-d\TH:i:s', $value . '1-1T00:00:00');
-        $stopDate = $dateTime::createFromFormat('Y-m-d\TH:i:s', $value . '12-3123:59:59');
+        $startDate = $dateTime::createFromFormat('Y-m-d\TH:i:s', $value . '-01-01T00:00:00');
+        $stopDate = $dateTime::createFromFormat('Y-m-d\TH:i:s', $value . '-12-31T23:59:59');
         break;
 
       case static::FACETAPI_DATE_MONTH:
-        $startDate = $dateTime::createFromFormat('Y-m-d\TH:i:s', $value . '-1T00:00:00');
-        $stopDate = $dateTime::createFromFormat('Y-m-d\TH:i:s', $value . '-31T23:59:59');
+        $startDate = $dateTime::createFromFormat('Y-m-d\TH:i:s', $value . '-01T00:00:00');
+        $stopDate = $dateTime::createFromFormat('Y-m-d\TH:i:s', $value . '-' . $startDate->format('t') .'T23:59:59');
         break;
 
       case static::FACETAPI_DATE_DAY: