diff --git a/NYSegmentedControl/NYSegmentLabel.m b/NYSegmentedControl/NYSegmentLabel.m
index 2f28519..4f1153f 100644
--- a/NYSegmentedControl/NYSegmentLabel.m
+++ b/NYSegmentedControl/NYSegmentLabel.m
@@ -59,7 +59,7 @@ - (void)drawRect:(CGRect)rect {
         CGContextAddPath(context, path);
         
         // Fill the path
-        CGContextFillPath(context);
+//        CGContextFillPath(context);
         CFRelease(path);
 
         // Clean up
diff --git a/NYSegmentedControl/NYSegmentedControl.m b/NYSegmentedControl/NYSegmentedControl.m
index 50dbcd4..a4d9ff5 100644
--- a/NYSegmentedControl/NYSegmentedControl.m
+++ b/NYSegmentedControl/NYSegmentedControl.m
@@ -176,12 +176,13 @@ - (void)layoutSubviews {
             if (self.selectedSegmentIndex == i) {
                 segment.titleLabel.font = self.selectedTitleFont;
                 segment.titleLabel.maskFrame = segment.titleLabel.bounds;
+                segment.titleLabel.textColor = self.selectedTitleTextColor;
             } else {
                 segment.titleLabel.font = self.titleFont;
+                segment.titleLabel.textColor = self.titleTextColor;
             }
             
             segment.titleLabel.alternativeTextColor = self.selectedTitleTextColor;
-            segment.titleLabel.textColor = self.titleTextColor;
         } else {
             segment.titleLabel.font = self.titleFont;
             segment.titleLabel.textColor = self.titleTextColor;
@@ -382,10 +383,11 @@ - (void)tapGestureRecognized:(UITapGestureRecognizer *)tapGestureRecognizer {
 #pragma mark - Helpers
 
 - (CGRect)indicatorFrameForSegment:(NYSegment *)segment {
-    return CGRectMake(CGRectGetMinX(segment.frame) + self.segmentIndicatorInset,
-                      CGRectGetMinY(segment.frame) + self.segmentIndicatorInset,
-                      CGRectGetWidth(segment.frame) - (2.0f * self.segmentIndicatorInset),
-                      CGRectGetHeight(segment.frame) - (2.0f * self.segmentIndicatorInset));
+    CGRect rect = CGRectMake(CGRectGetMinX(segment.frame) + self.segmentIndicatorInset,
+                             CGRectGetMinY(segment.frame) + self.segmentIndicatorInset,
+                             CGRectGetWidth(segment.frame) - (2.0f * self.segmentIndicatorInset),
+                             CGRectGetHeight(segment.frame) - (2.0f * self.segmentIndicatorInset));
+    return CGRectIntegral(rect);
 }
 
 #pragma mark - Getters and Setters