Bugfix for some elaborated templates