VID-262 fixing message issue