diff --git a/Pod/Classes/FSCalendar.m b/Pod/Classes/FSCalendar.m
index 23326ca..85182f1 100644
--- a/Pod/Classes/FSCalendar.m
+++ b/Pod/Classes/FSCalendar.m
@@ -602,13 +602,7 @@
 - (void)reloadData
 {
     NSIndexPath *selectedPath = [_collectionView indexPathsForSelectedItems].lastObject;
-    [_collectionView reloadData];
-    [_collectionView selectItemAtIndexPath:selectedPath animated:NO scrollPosition:UICollectionViewScrollPositionNone];
-    
-    _header.titleFont = self.headerTitleFont;
-    _header.titleColor = self.headerTitleColor;
-    _header.scrollDirection = self.collectionViewFlowLayout.scrollDirection;
-    [_header reloadData];
+    [self reloadData:selectedPath];
 }
 
 #pragma mark - Private
@@ -732,15 +726,15 @@
 
 - (void)reloadData:(NSIndexPath *)selection
 {
-    if (selection) {
-        [_collectionView reloadData];
-        [_collectionView selectItemAtIndexPath:selection
-                                      animated:NO
-                                scrollPosition:UICollectionViewScrollPositionNone];
-    } else {
-        [self reloadData];
-    }
+    [_collectionView reloadData];
+    [_collectionView selectItemAtIndexPath:selection animated:NO scrollPosition:UICollectionViewScrollPositionNone];
+    
     [_weekdays setValue:_weekdayFont forKey:@"font"];
+    
+    _header.titleFont = self.headerTitleFont;
+    _header.titleColor = self.headerTitleColor;
+    _header.scrollDirection = self.collectionViewFlowLayout.scrollDirection;
+    [_header reloadData];
 }
 
 @end
diff --git a/Pod/Classes/FSCalendarHeader.m b/Pod/Classes/FSCalendarHeader.m
index 0f4e544..df55b2e 100644
--- a/Pod/Classes/FSCalendarHeader.m
+++ b/Pod/Classes/FSCalendarHeader.m
@@ -161,8 +161,8 @@
         _scrollDirection = scrollDirection;
         _collectionViewFlowLayout.scrollDirection = scrollDirection;
         CGPoint newOffset = CGPointMake(
-                                        scrollDirection == UICollectionViewScrollDirectionHorizontal ? _scrollOffset * _collectionView.fs_width : 0,
-                                        scrollDirection == UICollectionViewScrollDirectionVertical ? _scrollOffset * _collectionView.fs_height : 0
+                                        scrollDirection == UICollectionViewScrollDirectionHorizontal ? (_scrollOffset-0.5)*_collectionViewFlowLayout.itemSize.width : 0,
+                                        scrollDirection == UICollectionViewScrollDirectionVertical ? _scrollOffset * _collectionViewFlowLayout.itemSize.height : 0
                                         );
         _collectionView.contentOffset = newOffset;
         if (scrollDirection == UICollectionViewScrollDirectionVertical) {