Fix for encoding terms, i.e., also need to be a string.#342