Deal with circuit_id collision
Merge pull request #912 from egbertbouman/circuitid_collision

Deal with circuit_id collision