Backup: fixed bug on messages