Recursion fix

There did seem to be a possible recursion issue. Fixed.