fixed edge case for outgoing