fix token creation