Draft: Fix (ish) for tom things

Stupidly simple fix for the problem in !648 (merged). Attention @tdingley, @vhomsak. See the last commit. I'll work on fixing this in Athena 😡...