diff --git a/src/streamReaders.js b/src/streamReaders.js
index ef7e1b0..7a7f2f3 100644
--- a/src/streamReaders.js
+++ b/src/streamReaders.js
@@ -20,9 +20,12 @@ const REGEXES = {
  * @returns {CommentToken}
  */
 export function comment(stream) {
-  const index = stream.indexOf('-->');
+  const endNeedle = '-->';
+  const index = stream.indexOf(endNeedle);
+  const startIndex = String('<!--').length;
+  const endIndex = index + endNeedle.length;
   if (index >= 0) {
-    return new CommentToken(stream.substr(4, index - 1), index + 3);
+    return new CommentToken(stream.substring(startIndex, endIndex), endIndex);
   }
 }
 
diff --git a/test/unit/streamReaders.spec.js b/test/unit/streamReaders.spec.js
index 4680914..9e5283e 100644
--- a/test/unit/streamReaders.spec.js
+++ b/test/unit/streamReaders.spec.js
@@ -60,6 +60,13 @@ describe('streamReaders', () => {
       expect(tok).not.to.be.ok();
     });
   });
+  
+  describe('comments on ScriptTag #atomicTag', () => {
+    it('keep comments on a ScriptTag', () => {
+      const tok = streamReaders.atomicTag('<script>/* lala */</script>');
+      expect(tok).to.have.property('content', '/* lala */');
+    });
+  });
 
   describe('#startTag', () => {
     it('reads a start tag', () => {