More lazy==>fail

Change-Id: Ifd928c509e1808bb5a1e890f59b0071b63349f78