Fixed null tag bug