diff --git a/library/src/com/viewpagerindicator/CirclePageIndicator.java b/library/src/com/viewpagerindicator/CirclePageIndicator.java
index f441e89fd..f93c2255b 100644
--- a/library/src/com/viewpagerindicator/CirclePageIndicator.java
+++ b/library/src/com/viewpagerindicator/CirclePageIndicator.java
@@ -238,7 +238,8 @@ protected void onDraw(Canvas canvas) {
         float dY;
 
         float pageFillRadius = mRadius;
-        if (mPaintStroke.getStrokeWidth() > 0) {
+        boolean hasStroke = mPaintStroke.getStrokeWidth() > 0;
+        if (hasStroke) {
             pageFillRadius -= mPaintStroke.getStrokeWidth() / 2.0f;
         }
 
@@ -258,7 +259,7 @@ protected void onDraw(Canvas canvas) {
             }
 
             // Only paint stroke if a stroke width was non-zero
-            if (pageFillRadius != mRadius) {
+            if (hasStroke) {
                 canvas.drawCircle(dX, dY, mRadius, mPaintStroke);
             }
         }