Fixing markup issue