Tried to fix the Header-#-tag bug.