Revert "Revert "Estructure Templates Fix 2""

This reverts commit 66589adc0afe7e86f097a0f34fbcfc401294632f.