Fixed untransformed message issue

Change-Id: I41def3aa1a0dfdcb4215a07740b863ef4a940d4a