Fixed token.empty bug