Fix findall issue