Fixing message validation