fix bugs for circular on frontend