Make Circle consistent with other shapes