diff --git a/TimesSquare/TSQCalendarRowCell.m b/TimesSquare/TSQCalendarRowCell.m
index 950b989..13697cb 100644
--- a/TimesSquare/TSQCalendarRowCell.m
+++ b/TimesSquare/TSQCalendarRowCell.m
@@ -198,6 +198,13 @@ - (IBAction)todayButtonPressed:(id)sender;
 
 - (void)layoutSubviews;
 {
+    if (!self.dayButtons) {
+        [self createDayButtons];
+        [self createNotThisMonthButtons];
+        [self createTodayButton];
+        [self createSelectedButton];
+    }
+    
     if (!self.backgroundView) {
         [self setBottomRow:NO];
     }