Fixed circularity bug