fixed message validation