Bug fixing on Messages