Fixing markup again and again