fixed find bugs issues