diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 6db0a15300..34f2c45c9d 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -311,7 +311,7 @@ bool Avatar::findSphereCollision(const glm::vec3& sphereCenter, float sphereRadi
 
     const HandData* handData = getHandData();
     if (handData) {
-        for (int i = 0; i < 2; i++) {
+        for (int i = 0; i < NUM_HANDS; i++) {
             const PalmData* palm = handData->getPalm(i);
             if (palm && palm->hasPaddle()) {
                 // create a disk collision proxy where the hand is
diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp
index e5be719b40..d3dec9d9e7 100644
--- a/interface/src/avatar/Hand.cpp
+++ b/interface/src/avatar/Hand.cpp
@@ -59,7 +59,7 @@ Hand::Hand(Avatar* owningAvatar) :
     _throwSound(QUrl("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/throw.raw")),
     _catchSound(QUrl("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/catch.raw"))
 {
-    for (int i = 0; i < MAX_HANDS; i++) {
+    for (int i = 0; i < NUM_HANDS; i++) {
         _toyBallInHand[i] = false;
         _ballParticleEditHandles[i] = NULL;
         _whichBallColor[i] = 0;
diff --git a/interface/src/avatar/Hand.h b/interface/src/avatar/Hand.h
index 0552c021f1..af0125931d 100755
--- a/interface/src/avatar/Hand.h
+++ b/interface/src/avatar/Hand.h
@@ -104,10 +104,9 @@ private:
     
     void simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, float deltaTime);
     
-    #define MAX_HANDS 2
-    bool _toyBallInHand[MAX_HANDS];
-    int _whichBallColor[MAX_HANDS];
-    ParticleEditHandle* _ballParticleEditHandles[MAX_HANDS];
+    bool _toyBallInHand[NUM_HANDS];
+    int _whichBallColor[NUM_HANDS];
+    ParticleEditHandle* _ballParticleEditHandles[NUM_HANDS];
     int _lastControllerButtons;
     
     float _pitchUpdate;