make it paranoid

Change-Id: I0a02b7174d0ae95b70c9d4b74fbc62827a741521