Fixes #6160, both KW and Codes now properly increment and decrement counter