diff --git a/src/Mustache/Engine.php b/src/Mustache/Engine.php
index abe17b2..0bfc9cc 100644
--- a/src/Mustache/Engine.php
+++ b/src/Mustache/Engine.php
@@ -23,7 +23,7 @@
  */
 class Mustache_Engine
 {
-    const VERSION        = '2.5.0';
+    const VERSION        = '2.5.1';
     const SPEC_VERSION   = '1.1.2';
 
     const PRAGMA_FILTERS = 'FILTERS';
diff --git a/src/Mustache/Tokenizer.php b/src/Mustache/Tokenizer.php
index a5da185..c701b25 100644
--- a/src/Mustache/Tokenizer.php
+++ b/src/Mustache/Tokenizer.php
@@ -200,7 +200,7 @@ class Mustache_Tokenizer
      */
     private function flushBuffer()
     {
-        if (!empty($this->buffer)) {
+        if (strlen($this->buffer) > 0) {
             $this->tokens[] = array(
                 self::TYPE  => self::T_TEXT,
                 self::LINE  => $this->line,
diff --git a/test/Mustache/Test/TokenizerTest.php b/test/Mustache/Test/TokenizerTest.php
index 87ace68..63a94d4 100644
--- a/test/Mustache/Test/TokenizerTest.php
+++ b/test/Mustache/Test/TokenizerTest.php
@@ -159,6 +159,35 @@ class Mustache_Test_TokenizerTest extends PHPUnit_Framework_TestCase
 
                 )
             ),
+
+            // See https://github.com/bobthecow/mustache.php/issues/183
+            array(
+                "{{# a }}0{{/ a }}",
+                null,
+                array(
+                    array(
+                        Mustache_Tokenizer::TYPE  => Mustache_Tokenizer::T_SECTION,
+                        Mustache_Tokenizer::NAME  => 'a',
+                        Mustache_Tokenizer::OTAG  => '{{',
+                        Mustache_Tokenizer::CTAG  => '}}',
+                        Mustache_Tokenizer::LINE  => 0,
+                        Mustache_Tokenizer::INDEX => 8,
+                    ),
+                    array(
+                        Mustache_Tokenizer::TYPE  => Mustache_Tokenizer::T_TEXT,
+                        Mustache_Tokenizer::LINE  => 0,
+                        Mustache_Tokenizer::VALUE => "0",
+                    ),
+                    array(
+                        Mustache_Tokenizer::TYPE  => Mustache_Tokenizer::T_END_SECTION,
+                        Mustache_Tokenizer::NAME  => 'a',
+                        Mustache_Tokenizer::OTAG  => '{{',
+                        Mustache_Tokenizer::CTAG  => '}}',
+                        Mustache_Tokenizer::LINE  => 0,
+                        Mustache_Tokenizer::INDEX => 9,
+                    ),
+                )
+            ),
         );
     }
 }