Fixed sending message behaviour