diff --git a/resources/Schema/Entities/RayAssaultBlue.xml b/resources/Schema/Entities/RayAssaultBlue.xml
index c358a4d5..e36c4073 100644
--- a/resources/Schema/Entities/RayAssaultBlue.xml
+++ b/resources/Schema/Entities/RayAssaultBlue.xml
@@ -17,10 +17,8 @@
           <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
           <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
           <KeepRatio>true</KeepRatio>
-          <Linear>true</Linear>
         </c:Sprite>
         <c:Transform>
-          <Position X="0" Y="0" Z="-0.5"/>
           <Orientation X="0" Y="-1.57099998" Z="0"/>
           <Scale X="1" Y="0.0700000003" Z="0"/>
         </c:Transform>
@@ -35,10 +33,8 @@
           <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
           <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
           <KeepRatio>true</KeepRatio>
-          <Linear>true</Linear>
         </c:Sprite>
         <c:Transform>
-          <Position X="0" Y="0" Z="-0.5"/>
           <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
           <Scale X="1" Y="0.0700000003" Z="0"/>
         </c:Transform>
diff --git a/resources/Schema/Entities/RaySideArmBlue.xml b/resources/Schema/Entities/RaySideArmBlue.xml
index 072f8e95..8a1648bc 100644
--- a/resources/Schema/Entities/RaySideArmBlue.xml
+++ b/resources/Schema/Entities/RaySideArmBlue.xml
@@ -3,10 +3,10 @@
 
   <Components>
     <c:Lifetime>
-      <Lifetime>0.08</Lifetime>
+      <Lifetime>0.080000000000000002</Lifetime>
     </c:Lifetime>
     <c:Fade>
-      <FadeTime>0.08</FadeTime>
+      <FadeTime>0.080000000000000002</FadeTime>
     </c:Fade>
     <c:Transform/>
   </Components>
@@ -20,10 +20,8 @@
           <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
           <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
           <KeepRatio>true</KeepRatio>
-          <Linear>true</Linear>
         </c:Sprite>
         <c:Transform>
-          <Position X="0" Y="0" Z="-0.5"/>
           <Orientation X="0" Y="-1.57099998" Z="0"/>
           <Scale X="1" Y="0.0250000004" Z="0"/>
         </c:Transform>
@@ -38,10 +36,8 @@
           <DiffuseTexture>Textures/Effects/NewRay5.png</DiffuseTexture>
           <Color A="1" B="2.35294127" G="1.17647064" R="0"/>
           <KeepRatio>true</KeepRatio>
-          <Linear>true</Linear>
         </c:Sprite>
         <c:Transform>
-          <Position X="0" Y="0" Z="-0.5"/>
           <Orientation X="0" Y="4.71218538" Z="3.14199996"/>
           <Scale X="1" Y="0.0250000004" Z="0"/>
         </c:Transform>
diff --git a/resources/Schema/Entities/WeaponAssaultBlueView.xml b/resources/Schema/Entities/WeaponAssaultBlueView.xml
index 74db0157..6fe36095 100644
--- a/resources/Schema/Entities/WeaponAssaultBlueView.xml
+++ b/resources/Schema/Entities/WeaponAssaultBlueView.xml
@@ -131,7 +131,7 @@
                   <EntityFile>Schema/Entities/RayAssaultBlue.xml</EntityFile>
                 </c:Spawner>
                 <c:Transform>
-                  <Position X="0.00123506912" Y="-0.00209517847" Z="-0.0250000004"/>
+                  <Position X="0.00179657922" Y="-0.00304772682" Z="-0.334699303"/>
                 </c:Transform>
               </Components>
               <Children/>
diff --git a/src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp b/src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
index 97144b60..85f1303f 100644
--- a/src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
+++ b/src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp
@@ -189,15 +189,16 @@ void SidearmWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
         return;
     }
 
-    //Tracer
+    // Tracer
     EntityWrapper tracerSpawner = weaponModelEntity.FirstChildByName("WeaponMuzzleRay");
     if (tracerSpawner.Valid()) {
         glm::vec3 origin = TransformSystem::AbsolutePosition(tracerSpawner);
-        glm::vec3 direction = TransformSystem::AbsoluteOrientation(tracerSpawner) * glm::vec3(0, 0, -1);
+        glm::vec3 direction = glm::quat(TransformSystem::AbsoluteOrientationEuler(tracerSpawner)) * glm::vec3(0, 0, -1);
         float distance = traceRayDistance(origin, direction);
         EntityWrapper ray = SpawnerSystem::Spawn(tracerSpawner, tracerSpawner);
         if (ray.Valid()) {
-            ((Field<glm::vec3>)ray["Transform"]["Scale"]).z(distance);
+            ((Field<glm::vec3>)ray["Transform"]["Scale"]).x(distance);
+            ((Field<glm::vec3>)ray["Transform"]["Position"]).z(-distance/2.f);
         }
     }