Fixed bug with double sending message