Fix for find_end regression test