Fix for the sending side too