Added ignoring circular reference