Remove unnecessary double token generation. Fixes #6