Add temporary workaround for infinite recursion