Fix bug on messages