Fixed bugs with do_not_send;