Fix for #758 - template update
Fix for #758 - template update