fixed find bug issues