Fixes a long-standing issue with not resetting the token after getters/setters