Fix counting