Template fix

closes #742