Fix Markup handling.