Fixed error where not all templates are pulled.