Fix an endless recursion loop