(FR #716) force search was necessary in some circumstances

Change-Id: I22574f5f34c2899ddb54b6c369b15562157b2c3e