Added unbounded detection