#16 fix the sending of data