fixed find builder