Fix tag null problem
Latest Update