fixing for data message type

same as previous fix but for data message type