Fix Issue #2025 where templates were not being transfered.