diff --git a/Calendar/CalendarKit/CalendarView.swift b/Calendar/CalendarKit/CalendarView.swift
index 8514f0a..216d728 100644
--- a/Calendar/CalendarKit/CalendarView.swift
+++ b/Calendar/CalendarKit/CalendarView.swift
@@ -27,11 +27,22 @@ class CalendarView: UIView, UICollectionViewDataSource, UICollectionViewDelegate
     var baseDate: Date? {
         didSet {
             collectionData = [CalendarLogic]()
-            if let date = baseDate {
-                var dateIter1 = date, dateIter2 = date
+            
+            let df = DateFormatter()
+            df.dateFormat = "yyyy-MM-dd"
+            
+            let str = df.string(from: baseDate!)
+            
+            let dateNew = df.date(from: str)            
+                        
+            if let date = dateNew {
+                
+                var dateIter1 = date
+                
+                var dateIter2 = date
                 
                 var set = Set<CalendarLogic>()
-                set.insert(CalendarLogic(date: baseDate!))
+                set.insert(CalendarLogic(date: dateNew!))
                 
                 // advance one year
                 (0..<kMonthRange).forEach { _ in
diff --git a/Calendar/ViewController.swift b/Calendar/ViewController.swift
index b26190c..0a1a189 100644
--- a/Calendar/ViewController.swift
+++ b/Calendar/ViewController.swift
@@ -16,7 +16,12 @@ class ViewController: UIViewController, CalendarViewDelegate {
         super.viewDidLoad()
         
         // todays date.
-        let date = Date()
+        let df = DateFormatter()
+        df.dateFormat = "yyyy-MM-dd"
+        
+        let str = df.string(from: Date())
+        
+        let date = df.date(from: str)!         
         
         // create an instance of calendar view with 
         // base date (Calendar shows 12 months range from current base date)