Yes.  I believe that change would fix #51.  I'll write a failing test first and then change this.