diff --git a/src/GF/Shell/Commands.hs b/src/GF/Shell/Commands.hs
index 2f7efa517..ecdc65ab4 100644
--- a/src/GF/Shell/Commands.hs
+++ b/src/GF/Shell/Commands.hs
@@ -403,7 +403,7 @@ displaySStateJavaX env state = unlines $ tagXML "gfedit" $ concat [
   lgrs   = allStateGrammarsWithNames env --- allActiveStateGrammarsWithNames env
   lins   = (langAbstract, exp) : linAll
   opts   = addOptions (optsSState state)   -- state opts override 
-              (addOption (markLin markOptJava) (globalOptions env))
+              (addOption (markLin mark) (globalOptions env))
   lin (n,gr) = (n, map uni $ linearizeState noWrap opts gr zipper) where
                   uni = optEncodeUTF8 n gr . mkUnicode
   exp    = prprTree $ loc2tree zipper
@@ -411,6 +411,7 @@ displaySStateJavaX env state = unlines $ tagXML "gfedit" $ concat [
   zipper = stateSState state
   linAll = map lin lgrs
   gr     = firstStateGrammar env
+  mark   = markOptJava -- to be: markOptXML
 
 langAbstract = language "Abstract"
 langXML      = language "XML"
diff --git a/src/Today.hs b/src/Today.hs
index de75a980c..8ac2a112b 100644
--- a/src/Today.hs
+++ b/src/Today.hs
@@ -1 +1 @@
-module Today where today = "Thu Sep 25 14:28:54 CEST 2003"
+module Today where today = "Thu Sep 25 14:49:28 CEST 2003"