(wip) ensures that dynamic tokens work correctly