Fixed bugs with circles and missing instances