handle if nil
fix missing tag