Fix for missing (renamed) template