diff --git a/resources/Schema/Entities/EditorWidgetRotate.xml b/resources/Schema/Entities/EditorWidgetRotate.xml
index 8c454f0c..6a5f72ea 100644
--- a/resources/Schema/Entities/EditorWidgetRotate.xml
+++ b/resources/Schema/Entities/EditorWidgetRotate.xml
@@ -3,9 +3,6 @@
 
   <Components>
     <c:Transform/>
-    <c:UniformScale>
-      <Scale X="0.200000003" Y="0.200000003" Z="0.200000003"/>
-    </c:UniformScale>
   </Components>
 
   <Children>
@@ -15,6 +12,7 @@
           <Type>
             <Rotate/>
           </Type>
+          <Axis X="1" Y="0" Z="0"/>
         </c:EditorWidget>
         <c:Model>
           <Resource>Models/RotationWidgetX.obj</Resource>
@@ -29,6 +27,7 @@
           <Type>
             <Rotate/>
           </Type>
+          <Axis X="0" Y="1" Z="0"/>
         </c:EditorWidget>
         <c:Model>
           <Resource>Models/RotationWidgetY.obj</Resource>
@@ -43,6 +42,7 @@
           <Type>
             <Rotate/>
           </Type>
+          <Axis X="0" Y="0" Z="1"/>
         </c:EditorWidget>
         <c:Model>
           <Resource>Models/RotationWidgetZ.obj</Resource>
diff --git a/src/Engine/Core/EntityFile.cpp b/src/Engine/Core/EntityFile.cpp
index 7609db2b..a8e93e49 100644
--- a/src/Engine/Core/EntityFile.cpp
+++ b/src/Engine/Core/EntityFile.cpp
@@ -171,7 +171,7 @@ void EntityFileSAXHandler::endElement(const XMLCh* const _uri, const XMLCh* cons
         //}
     }
 
-    if (m_StateStack.top() == State::ComponentField) {
+    if (m_StateStack.top() == State::ComponentField && name == m_CurrentField) {
         m_StateStack.pop();
         onEndComponentField(name);
         return;