those two are template bugs, but we need add this as hotfixes.