Fix for the template loader