Detect harder

Change-Id: Ic909c62420f8512556d69ae35635630330660f76