Fixed the senders instantiation bug