Issue Fix in templates compilation