#642 - Fixed states for templates.