Added exclusion list to fix accidental recursion