I think the cycle detection should be enhanced. Maybe Steve can give us a hint how to fix this.