changes for trying to resolve the problem with losing the originator address