Corrected bug on messaging