Should fix the count problem