Fixes broken partial template.
Merges hotfix