diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index e3c344587f..f0b6d052a1 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -100,7 +100,11 @@
 	data["category"] = category
 	data["categories"] = categories
 	if(all_robolimbs)
-		data["manufacturers"] = all_robolimbs
+		var/list/T = list()
+		for(var/A in all_robolimbs)
+			var/datum/robolimb/R = all_robolimbs[A]
+			T += list(list("id" = A, "company" = R.company))
+		data["manufacturers"] = T
 		data["manufacturer"] = manufacturer
 	data["materials"] = get_materials()
 	data["maxres"] = res_max_amount
diff --git a/nano/templates/mechfab.tmpl b/nano/templates/mechfab.tmpl
index 6f5faab8a0..8fcc82f877 100644
--- a/nano/templates/mechfab.tmpl
+++ b/nano/templates/mechfab.tmpl
@@ -7,7 +7,7 @@
 	{{if data.manufacturers}}
 		<div class="item">
 			{{for data.manufacturers}}
-				{{:helper.link(value, null, {'manufacturer' : value}, value == data.manufacturer ? 'selected' : null)}}
+				{{:helper.link(value.company, null, {'manufacturer' : value.id}, value.id == data.manufacturer ? 'selected' : null)}}
 			{{/for}}
 		</div>
 	{{/if}}