Bugfix: The whip counts are now only updated when the state is changed