[add] counting and fix support