Fixed template

All tests pass.