Improve fix for markup.