updates to support corner cases in circ