Added correct counting