Sender Bug Fix