messaging_fix