Uninstaller fix.
Merge pull request #2066 from Shqrdx/TemplateFix2

Uninstaller fix.