diff --git a/addons/overheating/XEH_preInit.sqf b/addons/overheating/XEH_preInit.sqf
index 5ed28f8a23..9b2c410ab4 100644
--- a/addons/overheating/XEH_preInit.sqf
+++ b/addons/overheating/XEH_preInit.sqf
@@ -5,5 +5,6 @@ PREP(clearJam);
 PREP(cooldown);
 PREP(jamWeapon);
 PREP(overheat);
+PREP(pfhDisplayTemperature);
 PREP(swapBarrel);
 PREP(swapBarrelCallback);
diff --git a/addons/overheating/functions/fnc_checkTemperature.sqf b/addons/overheating/functions/fnc_checkTemperature.sqf
index de2c45b1ff..800171ac55 100644
--- a/addons/overheating/functions/fnc_checkTemperature.sqf
+++ b/addons/overheating/functions/fnc_checkTemperature.sqf
@@ -1,64 +1,16 @@
 // by commy2 and CAA-Picard
 #include "\z\ace\addons\overheating\script_component.hpp"
 
-_this spawn {
-  _player = _this select 0;
-  _weapon = _this select 1;
+EXPLODE_2_PVT(_this,_player,_weapon);
 
-  // Calculate cool down of weapon since last shot
-  _string = format [QGVAR(%1), _weapon];
-  _overheat = _player getVariable [_string, [0, 0]];
-  _temperature = _overheat select 0;
-  _time = _overheat select 1;
+// Play animation and report temperature
+_action = getText (configFile >> "CfgWeapons" >> _weapon >> "ACE_checkTemperatureAction");
 
-  // Get physical parameters
-  _barrelMass = 0.50 * (getNumber (configFile >> "CfgWeapons" >> _weapon >> "WeaponSlotsInfo" >> "mass") / 22.0) max 1.0;
-
-  // Calculate cooling
-  _temperature = [_temperature, _barrelMass, time - _time] call FUNC(cooldown);
-
-  ["Overheating", _temperature, {format ["Temperature: %1 °C", _this]}] call EFUNC(common,log);
-
-  // Store new temperature
-  _time = time;
-  _player setVariable [_string, [_temperature, _time], false];
-  _scaledTemperature = (_temperature / 1000) min 1;
-
-  // Play animation and report temperature
-  _action = getText (configFile >> "CfgWeapons" >> _weapon >> "ACE_checkTemperatureAction");
-
-  if (_action == "") then {
-    _action = "Gear";
-  };
-
-  _player playActionNow _action;
-
-  sleep 1;
-
-  _color = [
-    2 * _scaledTemperature min 1,
-    2 * (1 - _scaledTemperature) min 1,
-    00
-  ];
-
-  _count = 2 + round (10 * _scaledTemperature);
-  _string = "";
-  for "_a" from 1 to _count do {
-    _string = _string + "|";
-  };
-  _text = [_string, _color] call EFUNC(common,stringToColoredText);
-
-  _string = "";
-  for "_a" from (_count + 1) to 12 do {
-    _string = _string + "|";
-  };
-
-  _text = composeText [
-    _text,
-    [_string, [0.5, 0.5, 0.5]] call EFUNC(common,stringToColoredTex)t
-  ];
-
-  _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture");
-
-  [_text, _picture] call EFUNC(common,displayTextPicture);
+if (_action == "") then {
+  _action = "Gear";
 };
+
+_player playActionNow _action;
+
+// Launch a PFH that waits a sec before displaying the temperature
+[FUNC(pfhDisplayTemperature), 1.0, [_player, _weapon, diag_tickTime]] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/overheating/functions/fnc_pfhDisplayTemperature.sqf b/addons/overheating/functions/fnc_pfhDisplayTemperature.sqf
new file mode 100644
index 0000000000..2f13856ee7
--- /dev/null
+++ b/addons/overheating/functions/fnc_pfhDisplayTemperature.sqf
@@ -0,0 +1,62 @@
+// by commy2 and CAA-Picard
+#include "\z\ace\addons\overheating\script_component.hpp"
+
+EXPLODE_2_PVT(_this,_params,_pfhId);
+EXPLODE_3_PVT(_params,_player,_weapon,_startTime);
+
+// Skip the first execution of the PFH
+if (diag_tickTime < _startTime + 0.5) exitWith {};
+
+// Remove the PFH on the second execution
+[_pfhId] call cba_fnc_removePerFrameHandler;
+
+// Calculate cool down of weapon since last shot
+private ["_string", "_overheat", "_temperature", "_time", "_barrelMass"];
+_string = format [QGVAR(%1), _weapon];
+_overheat = _player getVariable [_string, [0, 0]];
+_temperature = _overheat select 0;
+_time = _overheat select 1;
+
+// Get physical parameters
+_barrelMass = 0.50 * (getNumber (configFile >> "CfgWeapons" >> _weapon >> "WeaponSlotsInfo" >> "mass") / 22.0) max 1.0;
+
+// Calculate cooling
+_temperature = [_temperature, _barrelMass, time - _time] call FUNC(cooldown);
+
+//["Overheating", _temperature, {format ["Temperature: %1 °C", _this]}] call EFUNC(common,log);
+
+// Store new temperature
+_time = time;
+_player setVariable [_string, [_temperature, _time], false];
+
+
+
+private ["_scaledTemperature", "_action", "_color", "_count", "_string", "_text", "_picture"];
+_scaledTemperature = (_temperature / 1000) min 1;
+
+_color = [
+  2 * _scaledTemperature min 1,
+  2 * (1 - _scaledTemperature) min 1,
+  00
+];
+
+_count = 2 + round (10 * _scaledTemperature);
+_string = "";
+for "_a" from 1 to _count do {
+  _string = _string + "|";
+};
+_text = [_string, _color] call EFUNC(common,stringToColoredText);
+
+_string = "";
+for "_a" from (_count + 1) to 12 do {
+  _string = _string + "|";
+};
+
+_text = composeText [
+  _text,
+  [_string, [0.5, 0.5, 0.5]] call EFUNC(common,stringToColoredTex)t
+];
+
+_picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture");
+
+[_text, _picture] call EFUNC(common,displayTextPicture);
diff --git a/addons/resting/functions/fnc_pfhCheckRest.sqf b/addons/resting/functions/fnc_pfhCheckRest.sqf
index bc57e6f15c..ad0f73ad06 100644
--- a/addons/resting/functions/fnc_pfhCheckRest.sqf
+++ b/addons/resting/functions/fnc_pfhCheckRest.sqf
@@ -37,5 +37,5 @@ if (
   || {!(true in _intersects)}
 ) exitWith {
   [_pfhId] call cba_fnc_removePerFrameHandler;
-  [_unit, _vehicle, _weapon] call FUNC(unRestWeapon)
+  [_unit, _vehicle, _weapon] call FUNC(unRestWeapon);
 };