Possible bug fix for search after signal.