diff --git a/CTAssetsPickerController/CTAssetsViewController.m b/CTAssetsPickerController/CTAssetsViewController.m
index 4508adb0..11008a8c 100644
--- a/CTAssetsPickerController/CTAssetsViewController.m
+++ b/CTAssetsPickerController/CTAssetsViewController.m
@@ -70,7 +70,8 @@ @implementation CTAssetsViewController
 
 - (id)init
 {
-    UICollectionViewFlowLayout *layout = [self collectionViewFlowLayoutOfOrientation:self.interfaceOrientation];
+    UIInterfaceOrientation interfaceOrientation = [[UIApplication sharedApplication] statusBarOrientation];
+    UICollectionViewFlowLayout *layout = [self collectionViewFlowLayoutOfOrientation:interfaceOrientation];
     
     if (self = [super initWithCollectionViewLayout:layout])
     {
diff --git a/CTAssetsPickerController/NSDateFormatter+timeIntervalFormatter.m b/CTAssetsPickerController/NSDateFormatter+timeIntervalFormatter.m
index 0534edcc..3a22c5d7 100644
--- a/CTAssetsPickerController/NSDateFormatter+timeIntervalFormatter.m
+++ b/CTAssetsPickerController/NSDateFormatter+timeIntervalFormatter.m
@@ -82,8 +82,8 @@ - (NSDateComponents *)dateComponetsWithTimeInterval:(NSTimeInterval)timeInterval
     NSDate *date2 = [[NSDate alloc] initWithTimeInterval:timeInterval sinceDate:date1];
     
     unsigned int unitFlags =
-    NSSecondCalendarUnit | NSMinuteCalendarUnit | NSHourCalendarUnit |
-    NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit;
+    NSCalendarUnitSecond | NSCalendarUnitMinute | NSCalendarUnitHour |
+    NSCalendarUnitDay | NSCalendarUnitMonth | NSCalendarUnitYear;
     
     return [calendar components:unitFlags
                        fromDate:date1