Fixed #3461 : use search for forward check