#505 have to be fixed. I moved new tokens to the end of tokens list.