diff --git a/autoload/zencoding.vim b/autoload/zencoding.vim
index 20c3401..1c816a3 100644
--- a/autoload/zencoding.vim
+++ b/autoload/zencoding.vim
@@ -331,8 +331,8 @@ function! s:zen_toString_haml(settings, current, type, inline, filters, itemno,
     for attr in keys(current.attr)
       let val = current.attr[attr]
       if current.multiplier > 1
-        while val =~ '\$[^{]*'
-          let val = substitute(val, '\(\$\+\)\([^{]*\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+        while val =~ '\$\([^{]\|$\)'
+          let val = substitute(val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
         endwhile
       endif
       if attr == 'id'