fix commute bugs