Fixed Sending Issues