BUGFIX: Template referencing old subtemplates. Fixes #3.