diff --git a/app/imports/migrations/archive/migrateArchive1To2.js b/app/imports/migrations/archive/migrateArchive1To2.js
index 6038c2a9..5bbe75d1 100644
--- a/app/imports/migrations/archive/migrateArchive1To2.js
+++ b/app/imports/migrations/archive/migrateArchive1To2.js
@@ -2,7 +2,7 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import applyFnToKey from '/imports/api/engine/computation/utility/applyFnToKey.js';
 import { get } from 'lodash';
 
-const dollarSignRegex = /(\W)\$(\w+)/gi;
+const dollarSignRegex = /(\W|^)\$(\w+)/gi;
 
 export default function migrate1To2(archive) {
   archive.properties = archive.properties.map(prop => {
diff --git a/app/imports/migrations/server/dbv2/dbv2.js b/app/imports/migrations/server/dbv2/dbv2.js
index 8d311b78..4865a185 100644
--- a/app/imports/migrations/server/dbv2/dbv2.js
+++ b/app/imports/migrations/server/dbv2/dbv2.js
@@ -70,10 +70,10 @@ export function migratePropUp(prop, collection) {
   // Replace dollar sign with tilde in calculated fields
   update = dollarSignToTilde(prop, update);
 
-  // update the document, respecting the schema
+  // update the document
   if (update) {
     try {
-      collection.update({ _id: prop._id }, update, { selector: { type: prop.type } });
+      collection.update({ _id: prop._id }, update, { bypassCollection2: true });
     } catch (e) {
       console.warn('Doc Migration failed: ', prop._id, e);
     }
@@ -97,7 +97,7 @@ export function migratePropDown(prop, collection) {
   }
   if (update) {
     try {
-      collection.update({ _id: prop._id }, update, { selector: { type: prop.type } });
+      collection.update({ _id: prop._id }, update, { bypassCollection2: true });
     } catch (e) {
       console.warn('Doc Migration failed: ', prop._id, e);
     }
@@ -130,7 +130,7 @@ function countSubscribers() {
   bulkLibCols.execute();
 }
 
-const dollarSignRegex = /(\W)\$(\w+)/gi;
+const dollarSignRegex = /(\W|^)\$(\w+)/gi;
 function dollarSignToTilde(prop, update) {
   computedSchemas[prop.type]?.inlineCalculationFields()?.forEach(calcKey => {
     applyFnToKey(prop, calcKey, (prop, key) => {