A fix for sendings messages