Fix for backward search