diff --git a/dix/cursor.c b/dix/cursor.c
index 9a088f043..25d676779 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -293,13 +293,12 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
         size_t i, size = bits->width * bits->height;
 
         for (i = 0; i < size; i++) {
-            CARD32 a = argb[i] >> 24;
-
-            if (argb[i] > (a << 24 | a << 16 | a << 8 | a)) {
+            if ((argb[i] & 0xff000000) == 0 && (argb[i] & 0xffffff) != 0) {
                 /* ARGB data doesn't seem pre-multiplied, fix it */
                 for (i = 0; i < size; i++) {
-                    CARD32 ar, ag, ab;
+                    CARD32 a, ar, ag, ab;
 
+                    a = argb[i] >> 24;
                     ar = a * ((argb[i] >> 16) & 0xff) / 0xff;
                     ag = a * ((argb[i] >> 8) & 0xff) / 0xff;
                     ab = a * (argb[i] & 0xff) / 0xff;