diff --git a/comp/src/gb.markdown/.src/Markup.module b/comp/src/gb.markdown/.src/Markup.module
index 6605c9ab7..79b4787c3 100644
--- a/comp/src/gb.markdown/.src/Markup.module
+++ b/comp/src/gb.markdown/.src/Markup.module
@@ -68,6 +68,7 @@ Private Sub ConvertMarkup(aLine As String[], Optional bDoNotSetLine As Boolean)
   Dim aSaveTablePos As Integer[]
   Dim aSaveTableClass As String[]
   Dim sClass As String
+  Dim sList As String
   
   aResult = New String[]
   
@@ -207,7 +208,10 @@ Private Sub ConvertMarkup(aLine As String[], Optional bDoNotSetLine As Boolean)
         Endif
       Endif
       
-      If sLine Begins "* " Or If sLine Begins "- " Then
+      iPos = InStr(sLine, " ")
+      If iPos Then sList = Left(sLine, iPos - 1)
+      
+      If sList = "*" Or If sList = "-" Then
         
         hMarkupList = New MarkupList
         hMarkupList.sType = "ul"
@@ -230,7 +234,7 @@ Private Sub ConvertMarkup(aLine As String[], Optional bDoNotSetLine As Boolean)
         aResult.Add(Space$(iCurrentIndent) & "<li>")
         sLine = Mid$(sLine, 3)
         
-      Else If sLine Begins "+ " Then
+      Else If sList = "+" Or If Right(sList) = "." And IsDigit(Left(sList, -1)) Then
         
         hMarkupList = New MarkupList
         hMarkupList.sType = "ol"