OTOH you made me thinking about if that is really a good idea to add the terminator in the encode step. It should be either a separate option, or just up to the user completely.