~ fixed a bug when no message is present