Fixed counting and style