fixed put and get by token