Fixed issue #9218: When adding conditions fields referring to the same token field