Fixing circle conflict bug