diff --git a/petz/api/api_init_prop.lua b/petz/api/api_init_prop.lua
index 0f8571c..af6ccc4 100644
--- a/petz/api/api_init_prop.lua
+++ b/petz/api/api_init_prop.lua
@@ -54,6 +54,7 @@ petz.dyn_prop = {
 	owner = {type= "string", default = nil},
 	pregnant_count = {type= "int", default = petz.settings.pregnant_count},
 	pregnant_time = {type= "int", default = 0},
+	previous_status = {type= "string", default = nil},
 	saddle = {type= "boolean", default = false},
 	saddlebag = {type= "boolean", default = false},
 	saddlebag_inventory = {type= "table", default = {}},
diff --git a/petz/api/api_silk.lua b/petz/api/api_silk.lua
index 3da436c..566c36d 100644
--- a/petz/api/api_silk.lua
+++ b/petz/api/api_silk.lua
@@ -118,9 +118,7 @@ minetest.register_node("petz:spinning_wheel", {
 	end,
 
 	preserve_metadata = function(pos, oldnode, oldmeta, drops)
-		if oldmeta then
-			drops[1]:get_meta():set_int("silk_count", minetest.get_meta(pos):get_int("silk_count"))
-		end
+		drops[1]:get_meta():set_int("silk_count", minetest.get_meta(pos):get_int("silk_count"))
 	end,
 
 	on_rightclick = function(pos, node, player, itemstack, pointed_thing)
diff --git a/petz/api/api_sleep.lua b/petz/api/api_sleep.lua
index 9f77b35..c8564b1 100644
--- a/petz/api/api_sleep.lua
+++ b/petz/api/api_sleep.lua
@@ -55,6 +55,7 @@ petz.bh_sleep = function(self, prty)
 		--minetest.chat_send_player("singleplayer", "time of day="..tostring(timeofday).."/sleep_start_time="..tostring(self.sleep_start_time).."/sleep_end_time="..tostring(self.sleep_end_time))
 		if (self.status ~= "sleep") and (timeofday > sleep_start_time and timeofday < sleep_end_time) then
 			--minetest.chat_send_player("singleplayer", "prueba")
+			self.previous_status = kitz.remember(self, "previous_status", self.status)
 			petz.sleep(self, prty, false)
 		end
 	end
@@ -90,7 +91,7 @@ function petz.hq_sleep(self, prty, force)
 						kitz.clear_queue_high(self) --awake
 						local texture = self.textures[self.texture_no]
 						self.object:set_properties(self, {textures = {texture}}) --quit sleeping eyes
-						self.status = kitz.remember(self, "status", nil)
+						self.status = kitz.remember(self, "status", self.previous_status)
 						return true
 				else
 					petz.do_particles_effect(self.object, self.object:get_pos(), "sleep")