diff --git a/rpg-docs/lib/functions/parenting.js b/rpg-docs/lib/functions/parenting.js
index 1d2beac4..ee6b11f3 100644
--- a/rpg-docs/lib/functions/parenting.js
+++ b/rpg-docs/lib/functions/parenting.js
@@ -42,6 +42,12 @@ var inheritParentProperties = function(doc, collection){
 		"Document's parent does not exist"
 	);
 	var handMeDowns = _.pick(parent, collection.inheritedKeys);
+	if (
+		_.contains(collection.inheritedKeys, "charId") &&
+		doc.parent.collection === "Characters"
+	){
+		handMeDowns.charId = doc.parent.id;
+	}
 	if (_.isEmpty(handMeDowns)) return;
 	collection.update(doc._id, {$set: handMeDowns});
 };
@@ -77,8 +83,9 @@ makeChild = function(collection, inheritedKeys){
 	});
 
 	collection.after.update(function(userId, doc, fieldNames, modifier, options) {
-		if (modifier && modifier.$set && modifier.$set.parent){
+		if (modifier && modifier.$set && modifier.$set["parent.id"]){
 			//when we change parents, inherit its properties
+			console.log("re-inheriting")
 			inheritParentProperties(doc, collection);
 		}
 	});