fixed find funct