fixed token ORM problem