Fixed infinite loop on sending