Fix for problematic initial search