diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index dbe6eaf501..dbde6fe1e4 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -287,7 +287,7 @@ bool RenderableModelEntityItem::getAnimationFrame() {
 
     auto animation = getAnimation();
     if (animation && animation->isLoaded()) {
-        
+
         const QVector<FBXAnimationFrame>& frames = animation->getFramesReference(); // NOTE: getFrames() is too heavy
         auto& fbxJoints = animation->getGeometry().joints;
         
@@ -322,10 +322,10 @@ bool RenderableModelEntityItem::getAnimationFrame() {
                     if (index >= 0) {
                         glm::mat4 translationMat;
 
-                        if (allowTranslation){
+                        if (!allowTranslation){
                             translationMat = glm::translate(originalFbxJoints[index].translation);
                         }
-                        else if (!allowTranslation && index < translations.size()) {
+                        else if (allowTranslation && index < translations.size()) {
                             translationMat = glm::translate(translations[index]);
                         } 
                        
diff --git a/libraries/entities/src/AnimationPropertyGroup.cpp b/libraries/entities/src/AnimationPropertyGroup.cpp
index 18f56fa703..f1c5de53cf 100644
--- a/libraries/entities/src/AnimationPropertyGroup.cpp
+++ b/libraries/entities/src/AnimationPropertyGroup.cpp
@@ -206,7 +206,7 @@ bool AnimationPropertyGroup::appendToEditPacket(OctreePacketData* packetData,
                                     int& propertyCount,
                                     OctreeElement::AppendState& appendState) const {
 
-    bool successPropertyFits = true; 
+    bool successPropertyFits = true;
 
     APPEND_ENTITY_PROPERTY(PROP_ANIMATION_URL, getURL());
     APPEND_ENTITY_PROPERTY(PROP_ANIMATION_ALLOW_TRANSLATION, getAllowTranslation());
diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 07b55d419e..7237ced556 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -156,7 +156,6 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     READ_ENTITY_PROPERTY(PROP_JOINT_TRANSLATIONS_SET, QVector<bool>, setJointTranslationsSet);
     READ_ENTITY_PROPERTY(PROP_JOINT_TRANSLATIONS, QVector<glm::vec3>, setJointTranslations);
 
-
     return bytesRead;
 }
 
diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index 4dcd01b8cb..9daee95655 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -152,7 +152,7 @@ protected:
     bool isAnimatingSomething() const;
 
     rgbColor _color;
-    QString _modelURL; 
+    QString _modelURL;
     QUrl _parsedModelURL;
     QString _compoundShapeURL;