Fix for #13 - deal collision for natively bundled templates.