Fixed bug with how tokens are created.