diff --git a/Sources/Client/Client_Update.cpp b/Sources/Client/Client_Update.cpp
index 1b4d417e..38601f9e 100644
--- a/Sources/Client/Client_Update.cpp
+++ b/Sources/Client/Client_Update.cpp
@@ -1097,7 +1097,7 @@ namespace spades {
 				case SMG_WEAPON: vel = 360.f; break;
 				case SHOTGUN_WEAPON: vel = 500.f; break;
 			}
-			AddLocalEntity(stmp::make_unique<Tracer>(this, muzzlePos, hitPos, vel));
+			AddLocalEntity(stmp::make_unique<Tracer>(*this, muzzlePos, hitPos, vel));
 			AddLocalEntity(stmp::make_unique<MapViewTracer>(muzzlePos, hitPos, vel));
 		}
 
diff --git a/Sources/Client/Tracer.cpp b/Sources/Client/Tracer.cpp
index 4decd369..7bed2159 100644
--- a/Sources/Client/Tracer.cpp
+++ b/Sources/Client/Tracer.cpp
@@ -13,8 +13,8 @@
 
 namespace spades {
 	namespace client {
-		Tracer::Tracer(Client *cli, Vector3 p1, Vector3 p2, float bulletVel)
-		    : client(cli), startPos(p1), velocity(bulletVel) {
+		Tracer::Tracer(Client &_client, Vector3 p1, Vector3 p2, float bulletVel)
+		    : client(_client), startPos(p1), velocity(bulletVel) {
 			dir = (p2 - p1).Normalize();
 			length = (p2 - p1).GetLength();
 
@@ -29,7 +29,7 @@ namespace spades {
 
 			firstUpdate = true;
 
-			image = cli->GetRenderer().RegisterImage("Gfx/Ball.png");
+			image = client.GetRenderer().RegisterImage("Gfx/Ball.png");
 		}
 
 		bool Tracer::Update(float dt) {
@@ -44,7 +44,7 @@ namespace spades {
 		}
 
 		void Tracer::Render3D() {
-			IRenderer &r = client->GetRenderer();
+			IRenderer &r = client.GetRenderer();
 			if (dynamic_cast<draw::SWRenderer *>(&r)) {
 				// SWRenderer doesn't support long sprites (yet)
 				float startDist = curDistance;
diff --git a/Sources/Client/Tracer.h b/Sources/Client/Tracer.h
index 0a0222ae..caaed482 100644
--- a/Sources/Client/Tracer.h
+++ b/Sources/Client/Tracer.h
@@ -17,7 +17,7 @@ namespace spades {
 		class Client;
 		class IImage;
 		class Tracer : public ILocalEntity {
-			Client *client;
+			Client &client;
 			Handle<IImage> image;
 			Vector3 startPos, dir;
 			float length;
@@ -27,7 +27,7 @@ namespace spades {
 			bool firstUpdate;
 
 		public:
-			Tracer(Client *, Vector3 p1, Vector3 p2, float bulletVel);
+			Tracer(Client &, Vector3 p1, Vector3 p2, float bulletVel);
 			~Tracer();
 
 			bool Update(float dt) override;