Fixed endless recursion