Fixed a bug where the sender was not correct