Remove double sending issue