diff --git a/lib/foldcode.js b/lib/foldcode.js
index 6abb353..6d71af1 100644
--- a/lib/foldcode.js
+++ b/lib/foldcode.js
@@ -1,6 +1,6 @@
 // Modified version of CodeMirror's codefold.js to show guttermarkers
 
-CodeMirror.newFoldFunction = function(rangeFinder, widget, markOn, markOff, initMarks) {
+CodeMirror.newFoldFunction = function(rangeFinder, widget, markOn, markOff, dontCollapse) {
   if (widget == null) widget = "\u2194";
   if (typeof widget == "string") {
     var text = document.createTextNode(widget);
@@ -27,6 +27,7 @@ CodeMirror.newFoldFunction = function(rangeFinder, widget, markOn, markOff, init
     if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
     var range = rangeFinder(cm, pos);
     foldable = range && (range.from.line != range.to.line || range.from.ch != range.to.ch) ? true : false;
+    if (!foldable) cm.setGutterMarker(pos.line, "CodeMirror-linenumbers", null);
     if (!range) return;
 
     var present = cm.findMarksAt(range.from), cleared = 0;
@@ -38,10 +39,10 @@ CodeMirror.newFoldFunction = function(rangeFinder, widget, markOn, markOff, init
     }
 
     if (foldable) {
-      cm.setGutterMarker(pos.line, "CodeMirror-linenumbers", cleared || initMarks ? markOff.cloneNode(true) : markOn.cloneNode(true));
+      cm.setGutterMarker(pos.line, "CodeMirror-linenumbers", cleared || dontCollapse ? markOff.cloneNode(true) : markOn.cloneNode(true));
     }
 
-    if (cleared || initMarks) return;   
+    if (cleared || dontCollapse) return;   
     var myWidget = widget.cloneNode(true);
     CodeMirror.on(myWidget, "mousedown", function() {myRange.clear();cm.setGutterMarker(pos.line, "CodeMirror-linenumbers", markOff.cloneNode(true));});
     var myRange = cm.markText(range.from, range.to, {