Fixing markup implementation