diff --git a/ExSwift/NSDate.swift b/ExSwift/NSDate.swift
index 50d758e..6c5a439 100644
--- a/ExSwift/NSDate.swift
+++ b/ExSwift/NSDate.swift
@@ -252,7 +252,32 @@ public extension NSDate {
         let calendar = NSCalendar.currentCalendar()
         let components = calendar.components(component, fromDate: self)
 
-        return components.valueForComponent(component)
+        if component & NSCalendarUnit.CalendarUnitYear != nil {
+            return components.year
+        }
+        if component & NSCalendarUnit.CalendarUnitMonth != nil {
+            return components.month
+        }
+        if component & NSCalendarUnit.CalendarUnitDay != nil {
+            return components.day
+        }
+        if component & NSCalendarUnit.CalendarUnitWeekday != nil {
+            return components.weekday
+        }
+        if component & NSCalendarUnit.CalendarUnitWeekOfMonth != nil {
+            return components.weekOfMonth
+        }
+        if component & NSCalendarUnit.CalendarUnitHour != nil {
+            return components.hour
+        }
+        if component & NSCalendarUnit.CalendarUnitMinute != nil {
+            return components.minute
+        }
+        if component & NSCalendarUnit.CalendarUnitSecond != nil {
+            return components.second
+        }
+        
+        return 0
     }
 }