Fixed sending issue