diff --git a/addons/firesupport/functions/fnc_calculate_eta.sqf b/addons/firesupport/functions/fnc_calculate_eta.sqf
index cc0e2d4..676bed9 100644
--- a/addons/firesupport/functions/fnc_calculate_eta.sqf
+++ b/addons/firesupport/functions/fnc_calculate_eta.sqf
@@ -31,7 +31,7 @@ if ( count _listArray isEqualTo  2 ) then {
 	private _trp1Toggle = cbChecked (findDisplay MAIN_IDD displayCtrl TRP1);
 	private _trp1Index = lbCurSel TRP1_LIST;
 	if (_trp1Toggle) then {
-		if (_trp1Index != -1) then {
+		if (_trp1Index != -1 && (count GVAR(trpValues)) isNotEqualTo 0) then {
 			private _trp1Values = GVAR(trpValues) select _trp1Index;
 			_easting = _trp1Values select 1;
 			_northing = _trp1Values select 2;
diff --git a/addons/firesupport/functions/fnc_selected_bookmark.sqf b/addons/firesupport/functions/fnc_selected_bookmark.sqf
index f97bb57..8b9de0d 100644
--- a/addons/firesupport/functions/fnc_selected_bookmark.sqf
+++ b/addons/firesupport/functions/fnc_selected_bookmark.sqf
@@ -18,7 +18,6 @@ private _index = lbCurSel BOOKMARK_LIST_IDC;
 if ((count GVAR(bookmarkValues)-1) < _index) exitWith { };
 
 private _values = GVAR(bookmarkValues) select lbCurSel BOOKMARK_LIST_IDC;
-
 _values params ["_name", "_easting", "_northing", "_easting2", "_northing2", "_gun", "_gunText", "_ammoText", "_mode", "_modeText", "_count", "_radius", "_delay", "_trp1", "_trp2", "_timeCheck", "_hours", "_minutes", "_seconds", "_volley", "_trpList1", "_trpList2", "_trpList1Text", "_trpList2text"];
 private _trpList1TextConfirm = lbText [TRP1_LIST, _trpList1];
 private _trpList2textConfirm = lbText [TRP2_LIST, _trpList2];
@@ -33,7 +32,7 @@ ctrlSetText [NORTHING_END_IDC, _northing2];
 (findDisplay MAIN_IDD displayCtrl TOGGLETIME) cbSetChecked _timeCheck;
 (findDisplay MAIN_IDD displayCtrl TOGGLEVOLLEY) cbSetChecked _volley;
 
-[_trpList1, _trpList2] call FUNC(trpCheckbox);
+[_trp1, _trp2] call FUNC(trpCheckbox);
 [] call FUNC(timeCheckbox);
 
 private _errorText = "";
diff --git a/addons/firesupport/script_component.hpp b/addons/firesupport/script_component.hpp
index 3a442c9..e26f1b1 100644
--- a/addons/firesupport/script_component.hpp
+++ b/addons/firesupport/script_component.hpp
@@ -3,8 +3,8 @@
 
 #define MAJOR 2
 #define MINOR 0
-#define PATCHLVL 0
-#define BUILD 07082021
+#define PATCHLVL 1
+#define BUILD 21082021
 
 #define VERSION MAJOR.MINOR.PATCHLVL.BUILD
 #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD