Get rid of unneeded TRUE_AND_FIND_MORE hack