diff --git a/src/main/java/noppes/npcs/controllers/ServerCloneController.java b/src/main/java/noppes/npcs/controllers/ServerCloneController.java
index 5666535ae..354eab420 100644
--- a/src/main/java/noppes/npcs/controllers/ServerCloneController.java
+++ b/src/main/java/noppes/npcs/controllers/ServerCloneController.java
@@ -341,12 +341,11 @@ public class ServerCloneController implements ICloneHandler {
 
 	public void set(int tab, String name, IEntity entity) {
 		NBTTagCompound compound = new NBTTagCompound();
-		if (!entity.getMCEntity().isEntityAlive()) {
+		if (!entity.getMCEntity().writeMountToNBT(compound))
 			throw new CustomNPCsException("Cannot save dead entities", new Object[0]);
-		} else {
-			this.cleanTags(compound);
-			this.saveClone(tab, name, compound);
-		}
+
+        this.cleanTags(compound);
+        this.saveClone(tab, name, compound);
 	}
 
 	public void remove(int tab, String name) {