Fixed dynamic finders, small change