Changed the way we intercept the sends to avoid lossing state