Fixed a partial template bug in Builder.  Closes #63