fixed a circular call (closes #6864)
Merge branch '2.0' into 2.1

* 2.0:
  fixed a circular call (closes #6864)