Fixed the buggy token decorator