Code correction for handling "TAG not supported yet"