Fixed messages not being sent in some cases