TuanNA Fix bug