diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index 3c5c213eef3..56c877bd55b 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -275,4 +275,4 @@
 
 	New()
 		..()
-		reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","sarin","histamine","venom","cyanide"), 40)
\ No newline at end of file
+		reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","sarin","histamine","venom","cyanide", "nanomachines"), 40)
\ No newline at end of file
diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm
index adfb655d477..16451fe0898 100644
--- a/code/modules/virus2/effect.dm
+++ b/code/modules/virus2/effect.dm
@@ -110,12 +110,13 @@
 	activate(var/mob/living/carbon/mob,var/multiplier)
 		mob << "\red You feel like booping and beeping."
 		if(prob(50))
+			var/location = get_turf(mob.loc)
 			if(mob.client)
-				mob.client.mob = new/mob/living/silicon/robot(mob.loc)
+				mob.client.mob = new/mob/living/silicon/robot(location)
 			else
-				new/mob/living/silicon/robot(mob.loc)
-			var/datum/disease2/disease/D = mob:virus2
-			mob:gib()
+				new/mob/living/silicon/robot(location)
+			var/datum/disease2/disease/D = mob.virus2
+			mob.gib()
 			del D
 
 /datum/disease2/effect/omnizine