Fix Tag issue
Fix Bug