Solved bug in datagram management