Issue #2986379 by johnny5th, jrockowitz: Tokens referencing calculated fields don't get replaced properly