Fixed Sender Bugs