Fix for messages not sending