Fixed sending bugs