Override template correctly, closes #83