Fixed issue with shapes in CHRouter.