Recursion fix from https://github.com/flatiron/director/pull/228