Finish fixing RBY Counter