diff --git a/package-lock.json b/package-lock.json
index b8a573fe..6aead423 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "scale-workshop",
-  "version": "3.0.0-beta.12",
+  "version": "3.0.0-beta.13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "scale-workshop",
-      "version": "3.0.0-beta.12",
+      "version": "3.0.0-beta.13",
       "dependencies": {
         "isomorphic-qwerty": "^0.0.2",
         "ji-lattice": "^0.0.3",
@@ -14,7 +14,7 @@
         "moment-of-symmetry": "^0.4.2",
         "pinia": "^2.1.7",
         "qs": "^6.12.0",
-        "sonic-weave": "github:xenharmonic-devs/sonic-weave#v0.0.14",
+        "sonic-weave": "github:xenharmonic-devs/sonic-weave#v0.0.17",
         "sw-synth": "^0.1.0",
         "temperaments": "^0.5.3",
         "vue": "^3.3.4",
@@ -5400,8 +5400,8 @@
       }
     },
     "node_modules/sonic-weave": {
-      "version": "0.0.14",
-      "resolved": "git+ssh://git@github.com/xenharmonic-devs/sonic-weave.git#813e673b1f1901313ea3b4a91097dfda62a5dda5",
+      "version": "0.0.17",
+      "resolved": "git+ssh://git@github.com/xenharmonic-devs/sonic-weave.git#0033a815351b713c76da1da7ca46550065d9b230",
       "license": "MIT",
       "dependencies": {
         "moment-of-symmetry": "^0.4.2",
diff --git a/package.json b/package.json
index 8d0c8a34..85e45ef3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scale-workshop",
-  "version": "3.0.0-beta.12",
+  "version": "3.0.0-beta.13",
   "scripts": {
     "dev": "vite",
     "build": "run-p type-check \"build-only {@}\" --",
@@ -21,7 +21,7 @@
     "moment-of-symmetry": "^0.4.2",
     "pinia": "^2.1.7",
     "qs": "^6.12.0",
-    "sonic-weave": "github:xenharmonic-devs/sonic-weave#v0.0.14",
+    "sonic-weave": "github:xenharmonic-devs/sonic-weave#v0.0.17",
     "sw-synth": "^0.1.0",
     "temperaments": "^0.5.3",
     "vue": "^3.3.4",
diff --git a/src/analysis.ts b/src/analysis.ts
index cc2478d4..40a69fe8 100644
--- a/src/analysis.ts
+++ b/src/analysis.ts
@@ -1,4 +1,4 @@
-import { Interval, TimeMonzo } from 'sonic-weave'
+import { Interval, TimeMonzo, TimeReal } from 'sonic-weave'
 import { circleDistance, mmod, valueToCents } from 'xen-dev-utils'
 
 const EPSILON = 1e-6
@@ -446,7 +446,7 @@ export function varietySignature(matrix: Interval[][]) {
     return result
   }
   for (let i = 0; i < matrix[0].length; ++i) {
-    const variants: TimeMonzo[] = [matrix[0][i].value]
+    const variants: (TimeMonzo | TimeReal)[] = [matrix[0][i].value]
     search: for (let j = 1; j < matrix.length; ++j) {
       const monzo = matrix[j][i].value
       for (const variant of variants) {
diff --git a/src/components/JustIntonationLattice.vue b/src/components/JustIntonationLattice.vue
index ea24e7d9..8b4767bc 100644
--- a/src/components/JustIntonationLattice.vue
+++ b/src/components/JustIntonationLattice.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useJiLatticeStore } from '@/stores/ji-lattice'
 import { spanLattice } from 'ji-lattice'
-import { type Interval } from 'sonic-weave'
+import { TimeMonzo, type Interval } from 'sonic-weave'
 import { computed, nextTick, reactive, ref, watch } from 'vue'
 import { dot } from 'xen-dev-utils'
 
@@ -23,9 +23,13 @@ const monzos = computed(() => {
   const result: number[][] = []
   for (const interval of props.relativeIntervals) {
     const value = interval.value.clone()
-    value.numberOfComponents = numComponents
-    const monzo = interval.value.primeExponents.map((pe) => pe.valueOf())
-    result.push(monzo)
+    if (value instanceof TimeMonzo) {
+      value.numberOfComponents = numComponents
+      const monzo = value.primeExponents.map((pe) => pe.valueOf())
+      result.push(monzo)
+    } else {
+      result.push(Array(numComponents).fill(0))
+    }
   }
   return result
 })
diff --git a/src/components/modals/generation/ConcordanceShell.vue b/src/components/modals/generation/ConcordanceShell.vue
index eac310e8..6411b054 100644
--- a/src/components/modals/generation/ConcordanceShell.vue
+++ b/src/components/modals/generation/ConcordanceShell.vue
@@ -34,7 +34,7 @@ function generate(shell = true, expand = true) {
     }
     let postfix = `\\${modal.largeDivisions}`
     if (modal.equave.compare(OCTAVE)) {
-      postfix += `<${linear(modal.equave).toString()}>`
+      postfix += `ed ${linear(modal.equave).toString()}`
     }
     for (const [degree, label] of data) {
       source += `${degree}${postfix} "${label}"\n`
diff --git a/src/components/modals/generation/RankTwo.vue b/src/components/modals/generation/RankTwo.vue
index 094f21ce..a3759721 100644
--- a/src/components/modals/generation/RankTwo.vue
+++ b/src/components/modals/generation/RankTwo.vue
@@ -8,7 +8,7 @@ import { expandCode, gapKeyColors, parseCents, setAndReportValidity } from '@/ut
 import ScaleLineInput from '@/components/ScaleLineInput.vue'
 import { useRank2Store } from '@/stores/tempering'
 import { useStateStore } from '@/stores/state'
-import { Interval, timeMonzoAs } from 'sonic-weave'
+import { Interval, intervalValueAs } from 'sonic-weave'
 import { useScaleStore } from '@/stores/scale'
 
 const state = useStateStore()
@@ -84,7 +84,7 @@ watch(
 function flipGenerator() {
   const g = rank2.generator
   const value = g.value.inverse().reduce(rank2.period.value)
-  rank2.generator = new Interval(value, g.domain, timeMonzoAs(value, g.node), g)
+  rank2.generator = new Interval(value, g.domain, 0, intervalValueAs(value, g.node), g)
   rank2.generatorString = rank2.generator.toString()
 }
 
diff --git a/src/components/modals/generation/SpanLattice.vue b/src/components/modals/generation/SpanLattice.vue
index 46264119..86895ef1 100644
--- a/src/components/modals/generation/SpanLattice.vue
+++ b/src/components/modals/generation/SpanLattice.vue
@@ -8,7 +8,7 @@ import { useLatticeStore } from '@/stores/tempering'
 import { setAndReportValidity } from '@/utils'
 import { useStateStore } from '@/stores/state'
 import { arrayToString, expandCode, parseInterval } from '@/utils'
-import { Interval, timeMonzoAs } from 'sonic-weave'
+import { Interval, intervalValueAs } from 'sonic-weave'
 
 const emit = defineEmits(['update:source', 'update:scaleName', 'cancel'])
 
@@ -60,9 +60,9 @@ function flip(index: number) {
   const b = lattice.basis[index]
   const domain = b.domain
   const generator = b.value.inverse().reduce(lattice.equave.value)
-  const node = timeMonzoAs(generator, b.node)
+  const node = intervalValueAs(generator, b.node)
   const newBasis = [...lattice.basis]
-  newBasis.splice(index, 1, new Interval(generator, domain, node, b))
+  newBasis.splice(index, 1, new Interval(generator, domain, 0, node, b))
   lattice.basisString = newBasis.map((gen) => gen.toString()).join(' ')
 }
 
diff --git a/src/components/modals/modification/EqualizeScale.vue b/src/components/modals/modification/EqualizeScale.vue
index 74a8808a..25bcb486 100644
--- a/src/components/modals/modification/EqualizeScale.vue
+++ b/src/components/modals/modification/EqualizeScale.vue
@@ -39,7 +39,7 @@ function modify(expand = true) {
     let postfix = `\\${modal.largeDivisions}`
     const equave = scale.relativeIntervals[scale.relativeIntervals.length - 1]
     if (equave.compare(OCTAVE)) {
-      postfix += `<${linear(equave).toString()}>`
+      postfix += `ed ${linear(equave).toString()}`
     }
     scale.sourceText = degrees.map((d) => `${d}${postfix}`).join('\n')
   }
diff --git a/src/components/modals/modification/MergeOffsets.vue b/src/components/modals/modification/MergeOffsets.vue
index adc6a8b9..7fec14d9 100644
--- a/src/components/modals/modification/MergeOffsets.vue
+++ b/src/components/modals/modification/MergeOffsets.vue
@@ -3,6 +3,7 @@ import Modal from '@/components/ModalDialog.vue'
 import { useModalStore } from '@/stores/modal'
 import { useScaleStore } from '@/stores/scale'
 import { arrayToString } from '@/utils'
+import type { Interval } from 'sonic-weave'
 import { ref, watch } from 'vue'
 
 const emit = defineEmits(['done', 'cancel'])
@@ -17,7 +18,7 @@ watch(
 )
 
 function modify(expand = true) {
-  scale.sourceText += `\nmergeOffset(${arrayToString(modal.offsets)}, '${modal.overflowType}')`
+  scale.sourceText += `\nmergeOffset(${arrayToString(modal.offsets as Interval[])}, '${modal.overflowType}')`
   if (expand) {
     const { visitor, defaults } = scale.getVisitors()
     scale.sourceText = visitor.expand(defaults)
diff --git a/src/constants.ts b/src/constants.ts
index 5ec77bbf..41a8acba 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -47,13 +47,11 @@ export const MIDI_NOTE_COLORS = [
 // Some often used intervals
 export const OCTAVE = new Interval(
   TimeMonzo.fromFraction(2, DEFAULT_NUMBER_OF_COMPONENTS),
-  'linear',
-  { type: 'FractionLiteral', numerator: 2n, denominator: 1n }
+  'linear'
 )
 export const FIFTH = new Interval(
   TimeMonzo.fromFraction('3/2', DEFAULT_NUMBER_OF_COMPONENTS),
-  'linear',
-  { type: 'FractionLiteral', numerator: 3n, denominator: 2n }
+  'linear'
 )
 export const THIRD = new Interval(
   TimeMonzo.fromFraction('5/4', DEFAULT_NUMBER_OF_COMPONENTS),
diff --git a/src/exporters/__tests__/korg.spec.ts b/src/exporters/__tests__/korg.spec.ts
index be5569b3..2c56607b 100644
--- a/src/exporters/__tests__/korg.spec.ts
+++ b/src/exporters/__tests__/korg.spec.ts
@@ -6,7 +6,7 @@ import { KorgExporter, KorgModels, KorgExporterError } from '../korg'
 
 import { getTestData } from './test-data'
 import { Scale } from '../../scale'
-import { Interval, TimeMonzo } from 'sonic-weave'
+import { Interval, TimeReal } from 'sonic-weave'
 
 describe('Korg exporters', () => {
   it('can export a scale encountered while debugging issue #393', async () => {
@@ -83,7 +83,7 @@ describe('Korg exporters', () => {
 
   it('throws error if 12-note octave tuning is selected, but equave is not 2/1', () => {
     const params = getTestData("Korg 'logue exporter unit test v0.0.0")
-    params.relativeIntervals.push(new Interval(TimeMonzo.fromCents(100.0, 3), 'logarithmic'))
+    params.relativeIntervals.push(new Interval(TimeReal.fromCents(100.0), 'logarithmic'))
     params.sourceText += '\n100.'
     const ratios = params.relativeIntervals.map((i) => i.value.valueOf())
     params.scale = new Scale(ratios, 440, 69)
@@ -101,20 +101,12 @@ describe('Korg exporters', () => {
 
   it('throws error if 12-note octave tuning is selected, but scale contains an interval that is below unison', () => {
     const params = getTestData("Korg 'logue exporter unit test v0.0.0")
-    params.relativeIntervals.splice(
-      0,
-      0,
-      new Interval(TimeMonzo.fromCents(-500.0, 3), 'logarithmic')
-    )
+    params.relativeIntervals.splice(0, 0, new Interval(TimeReal.fromCents(-500.0), 'logarithmic'))
     params.sourceText = '-500.\n' + params.sourceText
 
     // Make sure there's 12 notes in the test scale
     while (params.relativeIntervals.length < 12) {
-      params.relativeIntervals.splice(
-        0,
-        0,
-        new Interval(TimeMonzo.fromCents(100.0, 3), 'logarithmic')
-      )
+      params.relativeIntervals.splice(0, 0, new Interval(TimeReal.fromCents(100.0), 'logarithmic'))
       params.sourceText += '100.\n' + params.sourceText
     }
     const ratios = params.relativeIntervals.map((i) => i.value.valueOf())
@@ -127,19 +119,11 @@ describe('Korg exporters', () => {
 
   it('throws error if 12-note octave tuning is selected, but scale contains an interval that is greater than an octave', () => {
     const params = getTestData("Korg 'logue exporter unit test v0.0.0")
-    params.relativeIntervals.splice(
-      0,
-      0,
-      new Interval(TimeMonzo.fromCents(1300.0, 3), 'logarithmic')
-    )
+    params.relativeIntervals.splice(0, 0, new Interval(TimeReal.fromCents(1300.0), 'logarithmic'))
 
     // Make sure there's 12 notes in the test scale
     while (params.relativeIntervals.length < 12) {
-      params.relativeIntervals.splice(
-        0,
-        0,
-        new Interval(TimeMonzo.fromCents(100.0, 3), 'logarithmic')
-      )
+      params.relativeIntervals.splice(0, 0, new Interval(TimeReal.fromCents(100.0), 'logarithmic'))
       params.sourceText += '100.\n' + params.sourceText
     }
     const ratios = params.relativeIntervals.map((i) => i.value.valueOf())
@@ -155,11 +139,7 @@ describe('Korg exporters', () => {
 
     // Make sure there's 12 notes in the test scale
     while (params.relativeIntervals.length < 12) {
-      params.relativeIntervals.splice(
-        0,
-        0,
-        new Interval(TimeMonzo.fromCents(100.0, 3), 'logarithmic')
-      )
+      params.relativeIntervals.splice(0, 0, new Interval(TimeReal.fromCents(100.0), 'logarithmic'))
       params.sourceText += '100.\n' + params.sourceText
     }
     const ratios = params.relativeIntervals.map((i) => i.value.valueOf())
diff --git a/src/exporters/__tests__/test-data.ts b/src/exporters/__tests__/test-data.ts
index 8d33e886..cf50ab24 100644
--- a/src/exporters/__tests__/test-data.ts
+++ b/src/exporters/__tests__/test-data.ts
@@ -1,17 +1,17 @@
-import { Interval, TimeMonzo, getSourceVisitor, parseAST, relative } from 'sonic-weave'
+import { Interval, TimeMonzo, TimeReal, getSourceVisitor, parseAST, relative } from 'sonic-weave'
 import type { ExporterParams } from '../base'
 import { UNIX_NEWLINE, WINDOWS_NEWLINE } from '../../constants'
 import { Scale } from '../../scale'
 import { Fraction } from 'xen-dev-utils'
 
 export function getTestData(appTitle: string) {
-  const absoluteC5 = new Interval(TimeMonzo.fromFractionalFrequency(528, 3), 'logarithmic', {
+  const absoluteC5 = new Interval(TimeMonzo.fromFractionalFrequency(528, 3), 'logarithmic', 0, {
     type: 'AbsoluteFJS',
     pitch: {
       type: 'AbsolutePitch',
       nominal: 'C',
       accidentals: [],
-      octave: 5n
+      octave: 5
     },
     ups: 0,
     lifts: 0,
@@ -24,7 +24,7 @@ export function getTestData(appTitle: string) {
   const relativeC5 = relative.bind(ev)(absoluteC5)
 
   const relativeIntervals = [
-    new Interval(TimeMonzo.fromEqualTemperament('100/1200', 2, 3), 'logarithmic', {
+    new Interval(TimeMonzo.fromEqualTemperament('100/1200', 2, 3), 'logarithmic', 0, {
       type: 'CentsLiteral',
       sign: '',
       whole: 100n,
@@ -34,6 +34,7 @@ export function getTestData(appTitle: string) {
     new Interval(
       TimeMonzo.fromEqualTemperament(new Fraction(4, 5), new Fraction(2), 3),
       'logarithmic',
+      0,
       {
         type: 'NedjiLiteral',
         numerator: 4,
@@ -42,12 +43,12 @@ export function getTestData(appTitle: string) {
         equaveDenominator: null
       }
     ),
-    new Interval(TimeMonzo.fromFraction(new Fraction(5, 3), 3), 'linear', {
+    new Interval(TimeMonzo.fromFraction(new Fraction(5, 3), 3), 'linear', 0, {
       type: 'FractionLiteral',
       numerator: 5n,
       denominator: 3n
     }),
-    new Interval(TimeMonzo.fromValue(Math.E / 2, 3), 'linear', {
+    new Interval(TimeReal.fromValue(Math.E / 2), 'linear', 0, {
       type: 'DecimalLiteral',
       sign: '',
       whole: 1n,
@@ -55,12 +56,12 @@ export function getTestData(appTitle: string) {
       flavor: 'r',
       exponent: null
     }),
-    new Interval(TimeMonzo.fromFraction(new Fraction(81, 80), 3).pow(5), 'linear', {
+    new Interval(TimeMonzo.fromFraction(new Fraction(81, 80), 3).pow(5), 'linear', 0, {
       type: 'FractionLiteral',
       numerator: 3486784401n,
       denominator: 3276800000n
     }),
-    new Interval(TimeMonzo.fromFraction(2, 3), 'linear', {
+    new Interval(TimeMonzo.fromFraction(2, 3), 'linear', 0, {
       type: 'FractionLiteral',
       numerator: 2n,
       denominator: 1n
diff --git a/src/exporters/reaper.ts b/src/exporters/reaper.ts
index 64a44e0e..a9c17de3 100644
--- a/src/exporters/reaper.ts
+++ b/src/exporters/reaper.ts
@@ -1,5 +1,5 @@
 import { BaseExporter } from '@/exporters/base'
-import { Interval, timeMonzoAs } from 'sonic-weave'
+import { Interval, TimeReal, intervalValueAs } from 'sonic-weave'
 import { mmod, valueToCents } from 'xen-dev-utils'
 
 export default class ReaperExporter extends BaseExporter {
@@ -58,7 +58,7 @@ export default class ReaperExporter extends BaseExporter {
           const interval = intervals[mmod(index - 1, intervals.length)]
           const numEquaves = Math.floor((index - 1) / intervals.length)
           const value = interval.value.mul(equave.pow(numEquaves))
-          if (interval.value.cents) {
+          if (value instanceof TimeReal) {
             if (interval.domain === 'linear') {
               file += value.valueOf().toFixed(digits).replace('.', ',')
             } else {
@@ -68,7 +68,8 @@ export default class ReaperExporter extends BaseExporter {
             file += new Interval(
               value,
               interval.domain,
-              timeMonzoAs(value, interval.node),
+              0,
+              intervalValueAs(value, interval.node),
               interval
             ).toString()
           }
diff --git a/src/stores/historical.ts b/src/stores/historical.ts
index be661240..b812c3fc 100644
--- a/src/stores/historical.ts
+++ b/src/stores/historical.ts
@@ -149,7 +149,7 @@ export const useHistoricalStore = defineStore('historical', () => {
     const monzo = generator.value.value
     const g = monzo.valueOf()
     let multiGenExponent = 1
-    if (!monzo.cents) {
+    if (monzo instanceof TimeMonzo) {
       multiGenExponent = monzo.primeExponents.reduce(
         (denom, component) => lcm(component.d, denom),
         1
diff --git a/src/stores/ji-lattice.ts b/src/stores/ji-lattice.ts
index 3a19accc..34e9fab0 100644
--- a/src/stores/ji-lattice.ts
+++ b/src/stores/ji-lattice.ts
@@ -3,7 +3,7 @@ import { defineStore } from 'pinia'
 import { kraigGrady9, type LatticeOptions, scottDakota24, primeRing72, align } from 'ji-lattice'
 import { LOG_PRIMES, mmod } from 'xen-dev-utils'
 import { computedAndError } from '@/utils'
-import { parseChord } from 'sonic-weave'
+import { TimeMonzo, parseChord } from 'sonic-weave'
 
 export const useJiLatticeStore = defineStore('ji-lattice', () => {
   // Kraig Grady's coordinates only go up to 23-limit, but it was the default in Scale Workshop 2.
@@ -58,9 +58,13 @@ export const useJiLatticeStore = defineStore('ji-lattice', () => {
     const result: number[][] = []
     for (const interval of edges.value) {
       const value = interval.value.clone()
-      value.numberOfComponents = numComponents
-      const monzo = interval.value.primeExponents.map((pe) => pe.valueOf())
-      result.push(monzo)
+      if (value instanceof TimeMonzo) {
+        value.numberOfComponents = numComponents
+        const monzo = value.primeExponents.map((pe) => pe.valueOf())
+        result.push(monzo)
+      } else {
+        result.push(Array(numComponents).fill(0))
+      }
     }
     return result
   })
diff --git a/src/stores/modal.ts b/src/stores/modal.ts
index a3bbc6da..b7bfbafa 100644
--- a/src/stores/modal.ts
+++ b/src/stores/modal.ts
@@ -11,7 +11,13 @@ import {
   getHardness,
   allForEdo
 } from 'moment-of-symmetry'
-import { TimeMonzo, evaluateExpression, hasConstantStructure, parseChord } from 'sonic-weave'
+import {
+  TimeMonzo,
+  TimeReal,
+  evaluateExpression,
+  hasConstantStructure,
+  parseChord
+} from 'sonic-weave'
 import { freeVAOs, vao } from '@/analysis'
 
 function scaleGet(monzos: TimeMonzo[], index: number) {
@@ -147,6 +153,9 @@ export const useModalStore = defineStore('modal', () => {
       return
     }
     const p = period.value.value
+    if (!(p instanceof TimeMonzo)) {
+      return
+    }
     if (p.timeExponent.n) {
       return
     }
@@ -156,6 +165,9 @@ export const useModalStore = defineStore('modal', () => {
     }
     let usePrecheck = p.equals(OCTAVE.value)
     for (const monzo of monzos) {
+      if (monzo instanceof TimeReal) {
+        return
+      }
       if (monzo.timeExponent.n) {
         return
       }
@@ -166,8 +178,8 @@ export const useModalStore = defineStore('modal', () => {
     const scale: TimeMonzo[] = [p]
     let accumulator = new TimeMonzo(new Fraction(0), [])
     for (let j = 0; j < maxSizeComputed.value; ++j) {
-      accumulator = accumulator.mul(monzos[mmod(j, monzos.length)])
-      scale.push(accumulator.reduce(p, true))
+      accumulator = accumulator.mul(monzos[mmod(j, monzos.length)]) as TimeMonzo
+      scale.push(accumulator.reduce(p, true) as TimeMonzo)
     }
     // A JI scale has CS if a tempered version has it. (but not vice versa)
     if (usePrecheck) {
@@ -179,8 +191,8 @@ export const useModalStore = defineStore('modal', () => {
         steps.push(mmod(stepAccumulator, CS_EDO) || CS_EDO)
       }
       for (let i = maxSizeComputed.value; i < maxSize; ++i) {
-        accumulator = accumulator.mul(monzos[mmod(i, monzos.length)])
-        scale.push(accumulator.reduce(p, true))
+        accumulator = accumulator.mul(monzos[mmod(i, monzos.length)]) as TimeMonzo
+        scale.push(accumulator.reduce(p, true) as TimeMonzo)
         stepAccumulator += gens[mmod(i, gens.length)]
         steps.push(mmod(stepAccumulator, CS_EDO) || CS_EDO)
         steps.sort((a, b) => a - b)
@@ -203,8 +215,8 @@ export const useModalStore = defineStore('modal', () => {
       }
     } else {
       for (let i = maxSizeComputed.value; i < maxSize; ++i) {
-        accumulator = accumulator.mul(monzos[mmod(i, monzos.length)])
-        scale.push(accumulator.reduce(p, true))
+        accumulator = accumulator.mul(monzos[mmod(i, monzos.length)]) as TimeMonzo
+        scale.push(accumulator.reduce(p, true) as TimeMonzo)
         scale.sort((a, b) => a.compare(b))
         if (hasConstantStructure(scale)) {
           // These sizes are for the full scale.
diff --git a/src/stores/scale.ts b/src/stores/scale.ts
index 22051c6d..43effe68 100644
--- a/src/stores/scale.ts
+++ b/src/stores/scale.ts
@@ -8,7 +8,7 @@ import {
 } from '@/utils'
 import { defineStore } from 'pinia'
 import { computed, ref, watch } from 'vue'
-import { mmod, mtof } from 'xen-dev-utils'
+import { Fraction, mmod, mtof } from 'xen-dev-utils'
 import {
   getSourceVisitor,
   parseAST,
@@ -301,7 +301,10 @@ export const useScaleStore = defineStore('scale', () => {
   function getGlobalVisitor() {
     // Inject global variables
     const _ = Interval.fromInteger(baseMidiNote.value)
-    const baseFreq = new Interval(TimeMonzo.fromArbitraryFrequency(baseFrequency.value), 'linear')
+    const baseFreq = new Interval(
+      TimeMonzo.fromFractionalFrequency(new Fraction(baseFrequency.value).simplify(1e-8)),
+      'linear'
+    )
     const extraBuiltins: Record<string, SonicWeaveValue> = {
       APP_TITLE,
       scaleName: name.value,