Bug fix in Sender class