fixing cases where client runs away and 1 byte overflow