fix 2 send related bugs