Adding special handling for circles