Fix preventing multiple messages sent