diff --git a/cybersyn/changelog.txt b/cybersyn/changelog.txt
index 18b154a..6ad5a53 100644
--- a/cybersyn/changelog.txt
+++ b/cybersyn/changelog.txt
@@ -1,8 +1,11 @@
 ---------------------------------------------------------------------------------------------------
 Version: 1.3.0
 Date: 2022-1-7
+  Changes:
+    - Improved performance when fuel threshold is set to 1
   Bugfixes:
     - Fixed a bug where it was possible for a single station to be updated twice per dispatch cycle, which could cause a crash
+    - Fixed a crash where trains would sometimes think a destoyed depot still exists
 ---------------------------------------------------------------------------------------------------
 Version: 1.2.9
 Date: 2022-1-7
diff --git a/cybersyn/scripts/main.lua b/cybersyn/scripts/main.lua
index a0bd752..4e721e6 100644
--- a/cybersyn/scripts/main.lua
+++ b/cybersyn/scripts/main.lua
@@ -31,7 +31,7 @@ function on_depot_broken(map_data, depot_id, depot)
 					local stops = e.force.get_train_stops({name = depot.entity_stop.backer_name, surface = e.surface})
 					for stop in rnext_consume, stops do
 						local new_depot_id = stop.unit_number
-						if map_data.depots[new_depot_id] then
+						if new_depot_id ~= depot_id and map_data.depots[new_depot_id] then
 							train.depot_id = new_depot_id--[[@as uint]]
 							goto continue
 						end
diff --git a/cybersyn/scripts/train-events.lua b/cybersyn/scripts/train-events.lua
index 4777677..e20fd14 100644
--- a/cybersyn/scripts/train-events.lua
+++ b/cybersyn/scripts/train-events.lua
@@ -278,28 +278,30 @@ local function on_train_leaves_stop(map_data, mod_settings, train_id, train)
 		train.r_station_id = nil
 		train.manifest = nil
 		--add to available trains for depot bypass
-		local fuel_fill = INF
-		for _, v in pairs(train.entity.locomotives) do
-			for _, loco in pairs(v) do
-				local inv = loco.get_fuel_inventory()
-				if inv then
-					local inv_size = #inv
-					if inv_size > 0 then
-						local fuel_total = 0
-						---@type uint
-						for i = 1, inv_size do
-							local item = inv[i]
-							if item.valid_for_read then
-								fuel_total = fuel_total + item.count/get_stack_size(map_data, item.name)
+		local fuel_fill = 1
+		if mod_settings.fuel_threshold < 1 then
+			for _, v in pairs(train.entity.locomotives) do
+				for _, loco in pairs(v) do
+					local inv = loco.get_fuel_inventory()
+					if inv then
+						local inv_size = #inv
+						if inv_size > 0 then
+							local fuel_total = 0
+							---@type uint
+							for i = 1, inv_size do
+								local item = inv[i]
+								if item.valid_for_read then
+									fuel_total = fuel_total + item.count/get_stack_size(map_data, item.name)
+								end
 							end
+							fuel_fill = min(fuel_fill, fuel_total/inv_size)
 						end
-						fuel_fill = min(fuel_fill, fuel_total/inv_size)
 					end
 				end
 			end
 		end
 		if fuel_fill > mod_settings.fuel_threshold then
-			--if fuel_fill == INF, it's probably a modded electric train
+			--if fuel_fill == 1, it's probably a modded electric train
 			if not train.disable_bypass then
 				train.status = STATUS_TO_D_BYPASS
 				add_available_train(map_data, train_id, train)