#125 fixed minor issue with token assignment