Fix creation of token