Fixed the 'token-hash' vs 'tokenhash' business