fix collecting tokens