Take circles into account