Fixing token error