1.7 ~ minor fixes circle