diff --git a/cybersyn/scripts/central-planning.lua b/cybersyn/scripts/central-planning.lua
index 5f4ebb2..0492d3d 100644
--- a/cybersyn/scripts/central-planning.lua
+++ b/cybersyn/scripts/central-planning.lua
@@ -467,7 +467,7 @@ function tick(map_data, mod_settings)
 		for i, id in pairs(map_data.warmup_station_ids) do
 			local station = map_data.stations[id]
 			if station then
-				if station.last_delivery_tick + mod_settings.warmup_time*mod_settings.tps >= map_data.total_ticks then--TODO: bug HERE
+				if station.last_delivery_tick + mod_settings.warmup_time*mod_settings.tps <= map_data.total_ticks then
 					map_data.active_station_ids[#map_data.active_station_ids + 1] = id
 					map_data.warmup_station_ids[i] = nil
 				end
diff --git a/cybersyn/scripts/main.lua b/cybersyn/scripts/main.lua
index 4754cc6..19534b0 100644
--- a/cybersyn/scripts/main.lua
+++ b/cybersyn/scripts/main.lua
@@ -64,7 +64,7 @@ local function add_available_train(map_data, depot_id, train_id)
 			network = {}
 			map_data.available_trains[network_name] = network
 		end
-		network[train_id] = depot.entity_stop.unit_number
+		network[train_id] = depot_id
 	end
 	depot.available_train_id = train_id
 	train.depot_id = depot_id