properly fix trnasition cancelling and circle removal