Bugfix: possible infinite recursion