Trying a fix for ListAllExtended.