diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp
index 0280f457..17fa79ee 100644
--- a/McZapkie/Oerlikon_ESt.cpp
+++ b/McZapkie/Oerlikon_ESt.cpp
@@ -319,7 +319,9 @@ void TNESt3::Init( double const PP, double const HPP, double const LPP, double c
 
     Zamykajacy = false;
 
-    if ( typeid(*FM) == typeid(TDisk1) || typeid(*FM) == typeid(TDisk2) ) // jesli zeliwo to schodz
+    auto const &frictionmaterial { *FM };
+    auto const &frictionmaterialtype { typeid( frictionmaterial ) };
+    if ( frictionmaterialtype == typeid(TDisk1) || frictionmaterialtype == typeid(TDisk2) ) // jesli zeliwo to schodz
         RapidStaly = true;
     else
         RapidStaly = false;
diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp
index e62c1f7a..388d5881 100644
--- a/McZapkie/hamulce.cpp
+++ b/McZapkie/hamulce.cpp
@@ -2675,7 +2675,9 @@ double TKE::GetPF(double const PP, double const dt, double const Vel)
 	ImplsRes->Flow(-dv);
 
 	// rapid
-	if (!(typeid(*FM) == typeid(TDisk1) || typeid(*FM) == typeid(TDisk2))) // jesli zeliwo to schodz
+	auto const &frictionmaterial{*FM};
+	auto const &frictionmaterialtype{typeid(frictionmaterial)};
+	if (!(frictionmaterialtype == typeid(TDisk1) || frictionmaterialtype == typeid(TDisk2))) // jesli zeliwo to schodz
 		RapidStatus = (BrakeDelayFlag & bdelay_R) == bdelay_R && (RV < 0 || (Vel > RV && RapidStatus) || Vel > RV + 20);
 	else // jesli tarczowki, to zostan
 		RapidStatus = (BrakeDelayFlag & bdelay_R) == bdelay_R;
diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp
index ee98ff09..095c9360 100644
--- a/vehicle/Train.cpp
+++ b/vehicle/Train.cpp
@@ -767,7 +767,9 @@ std::shared_ptr<dictionary_source> TTrain::GetTrainState(dictionary_source const
 	bool const bEP = mvControlled->LocHandle->GetCP() > 0.2 || fEIMParams[0][5] > 0.01;
 	dict->insert("dir_brake", bEP);
 	bool bPN{false};
-	if (typeid(*mvOccupied->Hamulec) == typeid(TLSt) || typeid(*mvOccupied->Hamulec) == typeid(TEStED))
+	auto const &brakevalve{*mvOccupied->Hamulec};
+	auto const &brakevalvetype{typeid(brakevalve)};
+	if (brakevalvetype == typeid(TLSt) || brakevalvetype == typeid(TEStED))
 	{
 
 		TBrake *temp_ham = mvOccupied->Hamulec.get();