Fixing Token reference bug