[DF-520] Fixed recursion at introspection