Fixed server sending logic