fix @originator check