Fix messages not sending correctly