Fixed bug with null tag