quick fix for deep recursion (RT#3267)